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

[Adam Williamson]

commit 5d45fd07740bc09942391771eb1c6871af535b72
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Jan 14 17:35:25 2011 +0000

    fix a couple of underlinking issues (underlink.patch)

 xfce4-mailwatch-plugin-1.1.0-underlink.patch |   21 +++++++++++++++++++++
 xfce4-mailwatch-plugin.spec                  |   16 +++++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)
---
diff --git a/xfce4-mailwatch-plugin-1.1.0-underlink.patch b/xfce4-mailwatch-plugin-1.1.0-underlink.patch
new file mode 100644
index 0000000..ada0df0
--- /dev/null
+++ b/xfce4-mailwatch-plugin-1.1.0-underlink.patch
@@ -0,0 +1,21 @@
+--- xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am	2008-08-26 03:42:36.000000000 +0100
++++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am.new	2011-01-14 17:27:44.116199383 +0000
+@@ -50,6 +50,7 @@
+ 	-I$(top_srcdir)/libmailwatch-core \
+ 	@GTHREAD_CFLAGS@ \
+ 	@LIBXFCE4PANEL_CFLAGS@ \
++	@LIBXFCEGUI4_CFLAGS@ \
+ 	-DDATADIR=\"$(datadir)\" \
+ 	-DLOCALEDIR=\"$(localedir)\"
+ 
+@@ -60,7 +61,9 @@
+ 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
+ 	@GTHREAD_LIBS@ \
+ 	@LIBXFCE4PANEL_LIBS@ \
+-	@GNUTLS_LIBS@
++	@LIBXFCEGUI4_LIBS@ \
++	@GNUTLS_LIBS@ \
++	-lgcrypt
+ 
+ if HAVE_CYGWIN
+   xfce4_mailwatch_plugin_LDFLAGS += \
diff --git a/xfce4-mailwatch-plugin.spec b/xfce4-mailwatch-plugin.spec
index c783367..36ebffd 100644
--- a/xfce4-mailwatch-plugin.spec
+++ b/xfce4-mailwatch-plugin.spec
@@ -1,6 +1,6 @@
 Name:		xfce4-mailwatch-plugin
 Version:	1.1.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Mail Watcher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -8,10 +8,13 @@ License:	GPLv2
 URL:		http://spuriousinterrupt.org/projects/mailwatch
 Source0:	http://spuriousinterrupt.org/files/mailwatch/%{name}-%{version}.tar.bz2
 Patch0:		xfce4-mailwatch-plugin-1.1.0-dsofix.patch
+# Fixes underlinking against libxfcegui and libgcrypt
+# http://bugzilla.xfce.org/show_bug.cgi?id=7096
+Patch1:		xfce4-mailwatch-plugin-1.1.0-underlink.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext
+BuildRequires:	gettext, libtool, xfce4-dev-tools
 BuildRequires:	libXt-devel
 # only enable TLS support if a recent version of gnutls is available
 %if 0%{?fedora} > 4
@@ -27,9 +30,13 @@ local mailboxes in Mbox, Maildir and MH-Maildir format as well as Gmail.
 %prep
 %setup -q
 %patch0 -p1 -b .dsofix
-
+%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}
 
@@ -70,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/doc/C/images/mailwatch-*.png
 
 %changelog
+* Fri Jan 14 2011 Adam Williamson <awilliam at redhat.com> - 1.1.0-6
+- fix a couple of underlinking issues (underlink.patch)
+
 * Wed Feb 17 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-5
 - Add patch to fix DSO linking (#564814)
 - Update icon-cache scriptlets