[bisho] Fix DSO build issues

Peter Robinson pbrobinson at fedoraproject.org
Mon May 7 21:06:07 UTC 2012


commit d33d01b0f1ec768a270c945dba1c4248ee2201e6
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon May 7 22:05:56 2012 +0100

    Fix DSO build issues

 bisho-fixdso.patch |   11 +++++++++++
 bisho.spec         |   10 ++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/bisho-fixdso.patch b/bisho-fixdso.patch
new file mode 100644
index 0000000..a46ba11
--- /dev/null
+++ b/bisho-fixdso.patch
@@ -0,0 +1,11 @@
+--- bisho-0.27.3/src/Makefile.in.orig	2012-05-07 21:16:41.892429381 +0100
++++ bisho-0.27.3/src/Makefile.in	2012-05-07 21:17:32.595438235 +0100
+@@ -198,7 +198,7 @@
+ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lgthread-2.0
+ LIBEXECDIR = @LIBEXECDIR@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
diff --git a/bisho.spec b/bisho.spec
index fe4c6f6..6c3dd67 100644
--- a/bisho.spec
+++ b/bisho.spec
@@ -5,17 +5,18 @@
 
 Name:          bisho
 Version:       0.27.3
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       MeeGo configuration tool for libsocialweb social network aggregator
 
 Group:         System Environment/Libraries
 License:       GPLv2+
 URL:           http://www.meego.com
 Source0:       %{tarfile}
+Patch0:        bisho-fixdso.patch
 
 BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
-BuildRequires: gnome-keyring-devel
+BuildRequires: libgnome-keyring-devel
 BuildRequires: libmx-devel
 BuildRequires: libsoup-devel
 BuildRequires: libsocialweb-devel
@@ -53,6 +54,8 @@ Files for development with %{name}.
 # Don't run configure from autogen.sh
 NOCONFIGURE=yes ./autogen.sh --disable-capplet
 
+%patch0 -p1 -b .fixdso
+
 %build
 %configure --disable-static --disable-schemas --disable-capplet
 
@@ -122,6 +125,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/pkgconfig/bisho.pc
 
 %changelog
+* Mon May  7 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.27.3-3
+- Fix DSO build issues
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.27.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list