[xesam-glib] - Fix implicit DSO linking bug

Deji Akingunola deji at fedoraproject.org
Tue Sep 28 18:25:03 UTC 2010 

commit 13e8d0254c50ed84cc51f3f9c4f62cb7d136d84c
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Tue Sep 28 14:25:14 2010 -0400

    - Fix implicit DSO linking bug

 xesam-glib-linking-fix.patch |  144 ++++++++++++++++++++++++++++++++++++++++++
 xesam-glib.spec              |    7 ++-
 2 files changed, 150 insertions(+), 1 deletions(-)
---
diff --git a/xesam-glib-linking-fix.patch b/xesam-glib-linking-fix.patch
new file mode 100644
index 0000000..ed5b19f
--- /dev/null
+++ b/xesam-glib-linking-fix.patch
@@ -0,0 +1,144 @@
+--- examples/Makefile.am	2008-09-07 15:34:32.000000000 -0400
++++ examples/Makefile.am.new	2010-09-28 10:50:06.447224511 -0400
+@@ -22,16 +22,19 @@
+ 	xesam-simple-search.c
+ 
+ xesam_simple_search_LDADD =	\
+-	$(xesam_libs)
++	$(xesam_libs)		\
++	$(XESAM_GLIB_LIBS)
+ 
+ xesam_relay_search_SOURCES =	\
+ 	xesam-relay-search.c
+ 
+ xesam_relay_search_LDADD =	\
+-	$(xesam_libs)
++	$(xesam_libs)		\
++	$(XESAM_GLIB_LIBS)
+ 
+ xesam_usl2xml_SOURCES =	\
+ 	xesam-usl2xml.c
+ 
+ xesam_usl2xml_LDADD =	\
+-	$(xesam_libs)
++	$(xesam_libs)	\
++	$(XESAM_GLIB_LIBS)
+--- examples/Makefile.in	2008-09-07 15:35:03.000000000 -0400
++++ examples/Makefile.in.new	2010-09-28 10:51:30.838218154 -0400
+@@ -267,19 +267,22 @@
+ 	xesam-simple-search.c
+ 
+ xesam_simple_search_LDADD = \
+-	$(xesam_libs)
++	$(xesam_libs)		\
++	$(XESAM_GLIB_LIBS)
+ 
+ xesam_relay_search_SOURCES = \
+ 	xesam-relay-search.c
+ 
+ xesam_relay_search_LDADD = \
+-	$(xesam_libs)
++	$(xesam_libs)		\
++	$(XESAM_GLIB_LIBS)
+ 
+ xesam_usl2xml_SOURCES = \
+ 	xesam-usl2xml.c
+ 
+ xesam_usl2xml_LDADD = \
+-	$(xesam_libs)
++	$(xesam_libs)	\
++	$(XESAM_GLIB_LIBS)
+ 
+ all: all-am
+ 
+--- test/Makefile.am	2008-09-07 15:34:32.000000000 -0400
++++ test/Makefile.am.new	2010-09-28 10:55:43.329575537 -0400
+@@ -30,40 +30,40 @@
+ 
+ TEST_PROGS				+= test-properties
+ test_properties_SOURCES	= test-properties.c $(helper_sources)
+-test_properties_LDADD	= $(xesam_libs)
++test_properties_LDADD	= $(xesam_libs) $(XESAM_GLIB_LIBS)
+ 
+ TEST_PROGS				+= test-searchers
+ test_searchers_SOURCES	= test-searchers.c $(helper_sources)
+-test_searchers_LDADD	= $(xesam_libs)
++test_searchers_LDADD	= $(xesam_libs) $(XESAM_GLIB_LIBS)
+ 
+ TEST_PROGS				+= test-session
+ test_session_SOURCES	= test-session.c $(helper_sources)
+-test_session_LDADD		= $(xesam_libs)
++test_session_LDADD		= $(xesam_libs) $(XESAM_GLIB_LIBS)
+ 
+ TEST_PROGS			+= test-search
+ test_search_SOURCES	= test-search.c $(helper_sources)
+-test_search_LDADD	= $(xesam_libs)
++test_search_LDADD	= $(xesam_libs) $(XESAM_GLIB_LIBS)
+ 
+ TEST_PROGS			+= test-hits
+ test_hits_SOURCES	= test-hits.c $(helper_sources)
+-test_hits_LDADD		= $(xesam_libs)
++test_hits_LDADD		= $(xesam_libs) $(XESAM_GLIB_LIBS)
+ 
+ TEST_PROGS			+= test-hit
+ test_hit_SOURCES	= test-hit.c $(helper_sources)
+-test_hit_LDADD		= $(xesam_libs)
++test_hit_LDADD		= $(xesam_libs) $(XESAM_GLIB_LIBS)
+ 
+ TEST_PROGS					+= test-query-parser
+ test_query_parser_SOURCES	= test-query-parser.c $(helper_sources)
+-test_query_parser_LDADD		= $(xesam_libs)
++test_query_parser_LDADD		= $(xesam_libs) $(XESAM_GLIB_LIBS)
+ 
+ TEST_PROGS						+= test-user-search-parser
+ test_user_search_parser_SOURCES	= test-user-search-parser.c $(helper_sources)
+-test_user_search_parser_LDADD	= $(xesam_libs)
++test_user_search_parser_LDADD	= $(xesam_libs) $(XESAM_GLIB_LIBS)
+ 
+ TEST_PROGS						+= test-xml-query-builder
+ test_xml_query_builder_SOURCES	= test-xml-query-builder.c $(helper_sources)
+-test_xml_query_builder_LDADD	= $(xesam_libs)
++test_xml_query_builder_LDADD	= $(xesam_libs) $(XESAM_GLIB_LIBS)
+ 
+ TEST_PROGS						+= test-query
+ test_query_SOURCES				= test-query.c $(helper_sources)
+-test_query_LDADD				= $(xesam_libs)
++test_query_LDADD				= $(xesam_libs) $(XESAM_GLIB_LIBS)
+--- test/Makefile.in	2008-09-07 15:35:03.000000000 -0400
++++ test/Makefile.in.new	2010-09-28 10:56:46.249226537 -0400
+@@ -318,25 +318,25 @@
+ 	../xesam-glib/xesam-g-debug-private.h
+ 
+ test_properties_SOURCES = test-properties.c $(helper_sources)
+-test_properties_LDADD = $(xesam_libs)
++test_properties_LDADD = $(xesam_libs) $(XESAM_GLIB_LIBS)
+ test_searchers_SOURCES = test-searchers.c $(helper_sources)
+-test_searchers_LDADD = $(xesam_libs)
++test_searchers_LDADD = $(xesam_libs) $(XESAM_GLIB_LIBS)
+ test_session_SOURCES = test-session.c $(helper_sources)
+-test_session_LDADD = $(xesam_libs)
++test_session_LDADD = $(xesam_libs) $(XESAM_GLIB_LIBS)
+ test_search_SOURCES = test-search.c $(helper_sources)
+-test_search_LDADD = $(xesam_libs)
++test_search_LDADD = $(xesam_libs) $(XESAM_GLIB_LIBS)
+ test_hits_SOURCES = test-hits.c $(helper_sources)
+-test_hits_LDADD = $(xesam_libs)
++test_hits_LDADD = $(xesam_libs) $(XESAM_GLIB_LIBS)
+ test_hit_SOURCES = test-hit.c $(helper_sources)
+-test_hit_LDADD = $(xesam_libs)
++test_hit_LDADD = $(xesam_libs) $(XESAM_GLIB_LIBS)
+ test_query_parser_SOURCES = test-query-parser.c $(helper_sources)
+-test_query_parser_LDADD = $(xesam_libs)
++test_query_parser_LDADD = $(xesam_libs) $(XESAM_GLIB_LIBS)
+ test_user_search_parser_SOURCES = test-user-search-parser.c $(helper_sources)
+-test_user_search_parser_LDADD = $(xesam_libs)
++test_user_search_parser_LDADD = $(xesam_libs) $(XESAM_GLIB_LIBS)
+ test_xml_query_builder_SOURCES = test-xml-query-builder.c $(helper_sources)
+-test_xml_query_builder_LDADD = $(xesam_libs)
++test_xml_query_builder_LDADD = $(xesam_libs) $(XESAM_GLIB_LIBS)
+ test_query_SOURCES = test-query.c $(helper_sources)
+-test_query_LDADD = $(xesam_libs)
++test_query_LDADD = $(xesam_libs) $(XESAM_GLIB_LIBS)
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/xesam-glib.spec b/xesam-glib.spec
index 6d43d97..f4e00ff 100644
--- a/xesam-glib.spec
+++ b/xesam-glib.spec
@@ -1,11 +1,12 @@
 Summary:	A GObject library for dealing with Xesam services
 Name:		xesam-glib
 Version:	0.5.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	LGPLv2+
 Group:		Applications/System
 URL:		http://xesam.org/people/kamstrup/xesam-glib/
 Source0:	http://xesam.org/people/kamstrup/%{name}/%{name}-%{version}.tar.gz
+Patch0:		xesam-glib-linking-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	dbus-glib-devel gettext
 BuildRequires:	gtk-doc pkgconfig perl(XML::Parser)
@@ -29,6 +30,7 @@ developing with xesam-glib.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure --disable-static 
@@ -67,6 +69,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/xesam-glib/
 
 %changelog
+* Mon Sep 27 2010 Deji Akingunola <dakingun at gmail.com> - 0.5.0-4
+- Fix implicit DSO linking bug
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

More information about the scm-commits mailing list