[geany] Add patch to fix FTBFS due to DSO linking, spec cleanup

[Peter Robinson]

commit 3372addb9ad02087d4d143e2dd66741a27074055
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon May 21 18:25:50 2012 +0100

    Add patch to fix FTBFS due to DSO linking, spec cleanup

 geany-fixdso.patch |   11 +++++++++++
 geany.spec         |   14 +++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/geany-fixdso.patch b/geany-fixdso.patch
new file mode 100644
index 0000000..b294149
--- /dev/null
+++ b/geany-fixdso.patch
@@ -0,0 +1,11 @@
+--- geany-0.21/src/Makefile.in.orig	2012-05-21 18:12:34.242577501 +0100
++++ geany-0.21/src/Makefile.in	2012-05-21 18:13:00.720254486 +0100
+@@ -222,7 +222,7 @@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lgmodule-2.0
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/geany.spec b/geany.spec
index 67c88a7..2969da0 100644
--- a/geany.spec
+++ b/geany.spec
@@ -5,13 +5,14 @@
 
 Name:      geany
 Version:   0.21
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
 License:   GPLv2+
 URL:       http://www.geany.org/
 Source0:   http://download.geany.org/%{name}-%{version}.tar.bz2
+Patch0:    geany-fixdso.patch
 
 # The following tags files were retrieved 6th Jan 2011,
 Source1:   http://download.geany.org/contrib/tags/dbus-glib-0.76.c.tags
@@ -38,8 +39,6 @@ Source21:  http://download.geany.org/contrib/tags/xfce48.c.tags
 Source22:  http://advamacs.com/pub/tcl.tcl.tags
 
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires: desktop-file-utils, gettext, gtk2-devel, glib2-devel, pango-devel, intltool
 BuildRequires: perl(XML::Parser)
 Requires: vte
@@ -74,6 +73,8 @@ Geany plug-ins. You do not need to install this package to use Geany.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fixdso
+
 # remove waf since this isn't needed for the build, we're building the package
 # with autotools
 rm -f waf
@@ -85,7 +86,6 @@ rm -f wscript
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=$RPM_BUILD_ROOT/%{geany_docdir}
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.ico
 desktop-file-install --delete-original --vendor="fedora"        \
@@ -118,9 +118,6 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
 %defattr(-, root, root, -)
 %exclude %{geany_docdir}/TODO
@@ -144,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Mon May 21 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.21-5
+- Add patch to fix FTBFS due to DSO linking, spec cleanup
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild