[xfce4-cellmodem-plugin] fix a typo issue and underlinking against xfcegui (Debian)

[Adam Williamson]

commit 90dbfece9ff13beacbccbf80c22164067782240a
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Jan 14 19:51:57 2011 +0000

    fix a typo issue and underlinking against xfcegui (Debian)

 01_typo-linking.patch                    |   16 +++++++++++++
 02_explicit-linking-to-libxfcegui4.patch |   35 ++++++++++++++++++++++++++++++
 xfce4-cellmodem-plugin.spec              |   18 +++++++++++++-
 3 files changed, 67 insertions(+), 2 deletions(-)
---
diff --git a/01_typo-linking.patch b/01_typo-linking.patch
new file mode 100644
index 0000000..6e849c4
--- /dev/null
+++ b/01_typo-linking.patch
@@ -0,0 +1,16 @@
+Description: fix typo in Makefile.am preventing correct linking
+Author: Nick Schermer <nick at xfce.org>
+Applied-Upstream: 0.0.5, http://git.xfce.org/panel-plugins/xfce4-cellmodem-plugin/commit/?id=404093d6e2f22064166b806711d5cb5d9dd935d2
+diff -ur xfce4-cellmodem-plugin-0.0.5.orig/panel-plugin/Makefile.am xfce4-cellmodem-plugin-0.0.5/panel-plugin/Makefile.am
+--- xfce4-cellmodem-plugin-0.0.5.orig/panel-plugin/Makefile.am  2007-01-16 21:58:53.000000000 +0200
++++ xfce4-cellmodem-plugin-0.0.5/panel-plugin/Makefile.am       2007-02-27 22:55:19.000000000 +0200
+@@ -5,7 +5,7 @@
+         -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ 	@LIBXFCE4PANEL_CFLAGS@
+ 
+-xfce4_cellmodem_plugin_LDFLAGS = \
++xfce4_cellmodem_plugin_LDADD = \
+ 	@LIBXFCE4PANEL_LIBS@ 
+ 
+ xfce4_cellmodem_plugin_SOURCES = \
+
diff --git a/02_explicit-linking-to-libxfcegui4.patch b/02_explicit-linking-to-libxfcegui4.patch
new file mode 100644
index 0000000..1807f4a
--- /dev/null
+++ b/02_explicit-linking-to-libxfcegui4.patch
@@ -0,0 +1,35 @@
+Description: add explicit linking to libxfcegui4
+Author: Yves-Alexis Perez <corsac at debian.org>
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6952
+xfce4_cellmodem_plugin-pin_helper.o: In function `pin_helper_pin_entry_callback':
+pin_helper.c:(.text+0xa6): undefined reference to `xfce_warn'
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,6 +18,8 @@
+ AC_CHECK_FUNCS([vasprintf])
+ 
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
++
+ XDT_I18N([cs pt])
+ 
+ AC_ARG_ENABLE([debug],
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -3,10 +3,12 @@
+ 
+ xfce4_cellmodem_plugin_CFLAGS = \
+         -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-	@LIBXFCE4PANEL_CFLAGS@
++	@LIBXFCE4PANEL_CFLAGS@ \
++	@LIBXFCEGUI4_CFLAGS@
+ 
+ xfce4_cellmodem_plugin_LDADD = \
+-	@LIBXFCE4PANEL_LIBS@ 
++	@LIBXFCE4PANEL_LIBS@ \
++	@LIBXFCEGUI4_LIBS@
+ 
+ xfce4_cellmodem_plugin_SOURCES = \
+ 	cellmodem.c modem_driver.c \
+
diff --git a/xfce4-cellmodem-plugin.spec b/xfce4-cellmodem-plugin.spec
index 9c875c6..dc5ff4f 100644
--- a/xfce4-cellmodem-plugin.spec
+++ b/xfce4-cellmodem-plugin.spec
@@ -2,18 +2,22 @@
 
 Name:           xfce4-cellmodem-plugin
 Version:        0.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cell Modem monitor plugin for the Xfce panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
+# From Debian: fix a typo in Makefile.am that breaks linking
+Patch0:         01_typo-linking.patch
+# From Debian: fix underlinking
+Patch1:         02_explicit-linking-to-libxfcegui4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.4.0
 BuildRequires:  libusb-devel
-BuildRequires:  gettext, intltool
+BuildRequires:  gettext, intltool, libtool, xfce4-dev-tools
 Requires:       xfce4-panel >= 4.4.0
  
 %description
@@ -31,9 +35,15 @@ monitoring purposes. Current features include:
 
 %prep
 %setup -q
+%patch0 -p1 -b .typo
+%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}
 
@@ -56,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 14 2011 Adam Williamson <awilliam at redhat.com> - 0.0.5-3
+- 01_typo-linking.patch: fix a typo (from Debian)
+- 02_explicit-linking-to-libxfcegui4.patch: fix linking (from Debian)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild