[xfce4-diskperf-plugin] fix linking and autoconf (patches from Debian)

[Adam Williamson]

commit 27f7e3580be84f704aa145c6c5fd21064d3e0628
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Jan 14 19:30:09 2011 +0000

    fix linking and autoconf (patches from Debian)

 01_fix-linking-libxfcegui4.patch |   41 ++++++++++++++++++++++++++++++++++++++
 02_fix-libtool.patch             |   22 ++++++++++++++++++++
 xfce4-diskperf-plugin.spec       |   20 ++++++++++++++++-
 3 files changed, 81 insertions(+), 2 deletions(-)
---
diff --git a/01_fix-linking-libxfcegui4.patch b/01_fix-linking-libxfcegui4.patch
new file mode 100644
index 0000000..29769ae
--- /dev/null
+++ b/01_fix-linking-libxfcegui4.patch
@@ -0,0 +1,41 @@
+commit 35af6821c13a7d20fe7fc31f964178e9fb369dfb
+Author: Landry Breuil <landry at rhaalovely.net>
+Date:   Sun Aug 8 10:44:58 2010 +0200
+
+    Be sure to have libxfcegui4 cflags/libs for xfce_err(), fixes
+    compilation with xfce4-panel 4.7. (Bug #6609)
+    Still needs to be converted to libxfce4ui though..
+
+diff --git a/configure.in b/configure.in
+index 6ea6bfb..8bbcf55 100644
+--- a/configure.in
++++ b/configure.in
+@@ -52,6 +52,7 @@ dnl ***********************************
+ dnl *** Check for required packages ***
+ dnl ***********************************
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90])
+ 
+ dnl ***********************************
+ dnl *** Check for debugging support ***
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index 604e7be..3c6b0f1 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -22,10 +22,12 @@
+ 	devperf.h
+ 
+ xfce4_diskperf_plugin_CFLAGS =					\
+-	$(LIBXFCE4PANEL_CFLAGS)
++	$(LIBXFCE4PANEL_CFLAGS)				\
++	$(LIBXFCEGUI4_CFLAGS)
+ 
+ xfce4_diskperf_plugin_LDADD=					\
+-	$(LIBXFCE4PANEL_LIBS)
++	$(LIBXFCE4PANEL_LIBS)				\
++	$(LIBXFCEGUI4_LIBS)
+ 
+ #
+ # Desktop file
+
+
diff --git a/02_fix-libtool.patch b/02_fix-libtool.patch
new file mode 100644
index 0000000..c35a7de
--- /dev/null
+++ b/02_fix-libtool.patch
@@ -0,0 +1,22 @@
+commit 2f7d6e565e9ce842a160cfdc9f0688222bdad560
+Author: Mike Massonnet <mmassonnet at xfce.org>
+Date:   Sun Feb 22 10:43:52 2009 +0000
+
+        * Call AC_PROG_LIBTOOL inside autoconf script
+    
+    
+    (Old svn revision: 6750)
+
+diff --git a/configure.in b/configure.in
+index bc57a34..8155ab9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -35,6 +35,7 @@ dnl ********************************
+ AC_PROG_CC()
+ AC_PROG_LD()
+ AC_PROG_INSTALL()
++AC_PROG_LIBTOOL()
+ AC_PROG_INTLTOOL()
+ 
+ dnl **********************************
+
diff --git a/xfce4-diskperf-plugin.spec b/xfce4-diskperf-plugin.spec
index 08ec77a..9485646 100644
--- a/xfce4-diskperf-plugin.spec
+++ b/xfce4-diskperf-plugin.spec
@@ -1,6 +1,6 @@
 Name:		xfce4-diskperf-plugin
 Version:	2.2.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,10 +10,16 @@ Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 # http://bugzilla.xfce.org/show_bug.cgi?id=3074
 Patch0:		%{name}-2.2.0-colors-at-startup.patch
 Patch1:		xfce4-diskperf-plugin-2.2.0-dsofix.patch
+# http://bugzilla.xfce.org/show_bug.cgi?id=6609
+# From Debian, Landry Breuil
+Patch2:		01_fix-linking-libxfcegui4.patch
+# http://bugzilla.xfce.org/show_bug.cgi?id=6609
+# From upstream via Debian
+Patch3:		02_fix-libtool.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.90, libxfcegui4-devel >= 4.3.90, libxml2-devel
-BuildRequires:	gettext, perl(XML::Parser)
+BuildRequires:	gettext, perl(XML::Parser), libtool, xfce4-dev-tools
 Requires:	xfce4-panel >= 4.4.0
 
 %description
@@ -24,8 +30,14 @@ second) based on data provided by the kernel.
 %setup -q
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .dsofix
+%patch2 -p1 -b .underlink
+%patch3 -p1 -b .libtool
 
 %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}
 
@@ -44,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Fri Jan 14 2011 Adam Williamson <awilliam at redhat.com> - 2.2.0-7
+- 01_fix-linking-libxfcegui4.patch: fix underlinking (Landry Breuil)
+- 02_fix-libtool.patch: fix autoconf (upstream via Debian)
+
 * Wed Feb 17 2010 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-6
 - Add patch to fix DSO linking (#564985)