[xfce4-sensors-plugin] fix a couple of underlinking issues (underlink.patch)

[Adam Williamson]

commit 04db44392c745e48b22c3f59946615571ba24c5f
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Jan 14 16:42:02 2011 +0000

    fix a couple of underlinking issues (underlink.patch)

 xfce4-sensors-plugin-1.0.0-underlink.patch |   36 ++++++++++++++++++++++++++++
 xfce4-sensors-plugin.spec                  |   16 ++++++++++--
 2 files changed, 49 insertions(+), 3 deletions(-)
---
diff --git a/xfce4-sensors-plugin-1.0.0-underlink.patch b/xfce4-sensors-plugin-1.0.0-underlink.patch
new file mode 100644
index 0000000..2a19d1d
--- /dev/null
+++ b/xfce4-sensors-plugin-1.0.0-underlink.patch
@@ -0,0 +1,36 @@
+--- xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am	2011-01-14 15:40:24.065537723 +0000
++++ xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am.new	2011-01-14 15:41:48.248960397 +0000
+@@ -20,6 +20,7 @@
+ 
+ xfce4_sensors_plugin_CFLAGS = \
+ 	@LIBXFCE4PANEL_CFLAGS@										   \
++	@LIBXFCEGUI4_CFLAGS@										\
+ 	@PLATFORM_CFLAGS@												\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"							\
+ 	@LIBSENSORS_CFLAGS@
+@@ -30,6 +31,7 @@
+ xfce4_sensors_plugin_LDFLAGS = 								\
+ 	$(top_builddir)/lib/libxfce4sensors.la								\
+ 	@LIBXFCE4PANEL_LIBS@											 \
++	@LIBXFCEGUI4_LIBS@											\
+ 	@SOLLIBS@														\
+ 	@LIBSENSORS_LDFLAGS@											 \
+ 	@LIBM@
+--- xfce4-sensors-plugin-1.0.0/src/Makefile.am	2009-11-06 11:02:11.000000000 +0000
++++ xfce4-sensors-plugin-1.0.0/src/Makefile.am.new	2011-01-14 16:19:09.777636193 +0000
+@@ -27,6 +27,7 @@
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ 	@LIBSENSORS_CFLAGS@	\
+ 	@LIBXFCE4UTIL_CFLAGS@ \
++	@LIBXFCE4PANEL_CFLAGS@ \
+ 	@LIBXFCEGUI4_CFLAGS@
+ 
+ # @GTK_CFLAGS@ 	\
+@@ -41,6 +42,7 @@
+ 	$(top_builddir)/lib/libxfce4sensors.la \
+ 	@LIBSENSORS_LDFLAGS@ \
+ 	@LIBXFCE4UTIL_LIBS@	\
++	@LIBXFCE4PANEL_LIBS@ \
+ 	@LIBXFCEGUI4_LIBS@ 
+ 
+ # @GTK_LIBS@ \
diff --git a/xfce4-sensors-plugin.spec b/xfce4-sensors-plugin.spec
index 23a1b89..348657f 100644
--- a/xfce4-sensors-plugin.spec
+++ b/xfce4-sensors-plugin.spec
@@ -1,6 +1,6 @@
 Name:           xfce4-sensors-plugin
 Version:        1.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Sensors plugin for the Xfce panel
 
 Group:          User Interface/Desktops
@@ -9,11 +9,14 @@ URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/1.0/%{name}-%{version}.tar.bz2
 Patch0:         xfce4-sensors-plugin-1.0.0-dso.patch
 Patch1:         xfce4-sensors-plugin-1.0.0-libnotify-0.7.0.patch
+# Fixes underlinking in panel-plugin and src
+# http://bugzilla.xfce.org/show_bug.cgi?id=7095
+Patch2:         xfce4-sensors-plugin-1.0.0-underlink.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0
 BuildRequires:  lm_sensors-devel >= 2.8, hddtemp, libnotify-devel >= 0.4
-BuildRequires:  gettext, perl(XML::Parser), intltool, desktop-file-utils
+BuildRequires:  gettext, perl(XML::Parser), intltool, desktop-file-utils, libtool, xfce4-dev-tools
 Requires:       xfce4-panel >= 4.4.1, lm_sensors >= 2.8, hddtemp
 ExcludeArch:    s390 s390x
 
@@ -36,9 +39,13 @@ Static libraries and header files for the xfce4-sensors-plugin.
 %if 0%{?fedora} >= 15
 %patch1 -p1 -b .libnotify-0.7.0
 %endif
-
+%patch2 -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 --with-pathhddtemp=%{_bindir}/hddtemp
 make %{?_smp_mflags}
 
@@ -92,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 14 2011 Adam Williamson <awilliam at redhat.com> - 1.0.0-3
+- fix some underlinking against xfcegui and xfcepanel (fixes build)
+
 * Sat Nov 06 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-2
 - Fix for libnotify 0.7.0