From b193c74da87ab9d25dc0c88e41354d11750ee910 Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert@fedoraproject.org>
Date: Feb 25 2010 19:36:51 +0000
Subject: - Add patch to fix DSO linking (#565202)


---

diff --git a/fbpanel-5.6-dsofix.patch b/fbpanel-5.6-dsofix.patch
new file mode 100644
index 0000000..d7b3df0
--- /dev/null
+++ b/fbpanel-5.6-dsofix.patch
@@ -0,0 +1,12 @@
+diff -dur fbpanel-5.6.orig/panel/Makefile.in fbpanel-5.6/panel/Makefile.in
+--- fbpanel-5.6.orig/panel/Makefile.in	2009-06-27 21:18:12.000000000 +0200
++++ fbpanel-5.6/panel/Makefile.in	2010-02-25 20:07:57.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ SRCS = panel.c misc.c plugin.c gtkbar.c bg.c gtkbgbox.c ev.c configurator.c 
+ BINTARGET = fbpanel
+-LDFLAGS += $(GMODULE_LIBS)
++LDFLAGS += $(GMODULE_LIBS) -lX11
+ 
+ ifeq (enabled,$(STATIC_BUILD))
+ OBJS += $(wildcard $(TOPDIR)/plugins/*/*.o)
diff --git a/fbpanel.spec b/fbpanel.spec
index ab6369f..7b81545 100644
--- a/fbpanel.spec
+++ b/fbpanel.spec
@@ -1,6 +1,6 @@
 Name:		fbpanel
 Version:	5.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A lightweight X11 desktop panel
 
 Group:		User Interface/Desktops
@@ -9,7 +9,9 @@ Group:		User Interface/Desktops
 License:	LGPLv2+ and GPLv2+
 URL:		http://fbpanel.sourceforge.net
 Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tbz2
-Patch0:		fbpanel-5.6-default-config.patch
+Patch0:		fbpanel-5.6-dsofix.patch
+# distro specific patches
+Patch10:	fbpanel-5.6-default-config.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel libXpm-devel libXmu-devel desktop-file-utils
@@ -21,7 +23,8 @@ It features tasklist, pager, launchbar, clock, menu and systray.
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
+%patch0 -p1 -b .dsofix
+%patch10 -p1 -b .orig
 # preserve timestamps during install
 sed -i.stamp -e 's|install -m|install -p -m|' scripts/install.sh
 
@@ -82,6 +85,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Feb 25 2010 Christoph Wickert <cwickert@fedoraproject.org> - 5.6-2
+- Add patch to fix DSO linking (#565202)
+
 * Sun Feb 07 2010 Christoph Wickert <cwickert@fedoraproject.org> - 5.6-1
 - Update to 5.6
 - Update icon-cache scriptlets