[xfce4-genmon-plugin] fix an underlinking issue (underlink.patch)

[Adam Williamson]

commit c340a5d9d1c84006a246166dba8faa1320f01563
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Jan 14 18:26:57 2011 +0000

    fix an underlinking issue (underlink.patch)

 xfce4-genmon-plugin-3.2-underlink.patch |   27 +++++++++++++++++++++++++++
 xfce4-genmon-plugin.spec                |   15 +++++++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
---
diff --git a/xfce4-genmon-plugin-3.2-underlink.patch b/xfce4-genmon-plugin-3.2-underlink.patch
new file mode 100644
index 0000000..41f8ab4
--- /dev/null
+++ b/xfce4-genmon-plugin-3.2-underlink.patch
@@ -0,0 +1,27 @@
+--- xfce4-genmon-plugin-3.2/panel-plugin/Makefile.am	2007-11-23 15:32:40.000000000 +0000
++++ xfce4-genmon-plugin-3.2/panel-plugin/Makefile.am.new	2011-01-14 18:13:18.662136456 +0000
+@@ -3,10 +3,12 @@
+ 
+ xfce4_genmon_plugin_CFLAGS =					\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
+-	@LIBXFCE4PANEL_CFLAGS@
++	@LIBXFCE4PANEL_CFLAGS@					\
++	@LIBXFCEGUI4_CFLAGS@
+ 
+ xfce4_genmon_plugin_LDADD =					\
+-	@LIBXFCE4PANEL_LIBS@
++	@LIBXFCE4PANEL_LIBS@					\
++	@LIBXFCEGUI4_LIBS@
+ 
+ xfce4_genmon_plugin_SOURCES =	\
+ 	main.c			\
+--- xfce4-genmon-plugin-3.2/configure.ac	2011-01-14 18:18:53.410130665 +0000
++++ xfce4-genmon-plugin-3.2/configure.ac.new	2011-01-14 18:18:58.431354545 +0000
+@@ -32,6 +32,7 @@
+ 
+ dnl configure the panel plugin
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.22])
+ 
+ dnl Translations
+ XDT_I18N([ca cs en_GB eu fr pl pt_PT sq])
diff --git a/xfce4-genmon-plugin.spec b/xfce4-genmon-plugin.spec
index 07cebe2..98843ef 100644
--- a/xfce4-genmon-plugin.spec
+++ b/xfce4-genmon-plugin.spec
@@ -1,6 +1,6 @@
 Name:           xfce4-genmon-plugin
 Version:        3.2
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Generic monitor plugin for the Xfce panel
 
 Group:          User Interface/Desktops
@@ -9,10 +9,13 @@ URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 # http://bugzilla.xfce.org/show_bug.cgi?id=3896
 Patch0:         xfce4-genmon-plugin-3.2-no-zombies.patch
+# Fixes underlinking against libxfcegui and libgcrypt
+# http://bugzilla.xfce.org/show_bug.cgi?id=7097
+Patch1:		xfce4-genmon-plugin-3.2-underlink.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
-BuildRequires:  gettext, perl(XML::Parser)
+BuildRequires:  gettext, perl(XML::Parser), libtool, xfce4-dev-tools
 Requires:       xfce4-panel >= 4.4.0
 
 %description
@@ -22,8 +25,13 @@ captures its output and displays it as a string into the panel.
 %prep
 %setup -q
 %patch0 -p1 -b .zombie-process
+%patch1 -p1 -b .underlink
 
 %build
+# Xfce has its own autotools-running-script thingy, if you use autoreconf
+# it'll fall apart horribly
+xdt-autogen
+
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -42,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Fri Jan 14 2011 Adam Williamson <awilliam at redhat.com> - 3.2-6
+- fix a couple of underlinking issues (underlink.patch)
+
 * Sat Dec 11 2010 Christoph Wickert <cwickert at fedoraproject.org> - 3.2-5
 - Fix zombie process (bugzilla.xfce.org #3896)