rpms/rasqal/devel rasqal-0.9.17-linking.patch, NONE, 1.1 rasqal.spec, 1.11, 1.12

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/rasqal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13849

Modified Files:
	rasqal.spec 
Added Files:
	rasqal-0.9.17-linking.patch 
Log Message:
* Sat Feb 13 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.9.17-2
- Fix DSO linking error RHBZ#564859
- Remove rpath hack. Not needed anymore.


rasqal-0.9.17-linking.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rasqal-0.9.17-linking.patch ---
diff -rupN rasqal-0.9.17.old/utils/Makefile.in rasqal-0.9.17/utils/Makefile.in
--- rasqal-0.9.17.old/utils/Makefile.in	2009-12-14 09:45:05.000000000 -0500
+++ rasqal-0.9.17/utils/Makefile.in	2010-02-14 15:40:04.000000000 -0500
@@ -285,7 +285,7 @@ man_MANS = roqet.1
 AM_CPPFLAGS = @RASQAL_INTERNAL_CPPFLAGS@ -I$(top_srcdir)/src
 AM_CFLAGS = $(MEM)
 roqet_SOURCES = roqet.c $(am__append_1)
-roqet_LDADD = $(top_builddir)/src/librasqal.la
+roqet_LDADD = -lraptor $(top_builddir)/src/librasqal.la
 srxread_SOURCES = srxread.c
 srxread_LDADD = $(top_builddir)/src/librasqal.la
 EXTRA_DIST = \


Index: rasqal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rasqal/devel/rasqal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rasqal.spec	3 Jan 2010 22:36:43 -0000	1.11
+++ rasqal.spec	14 Feb 2010 20:59:54 -0000	1.12
@@ -1,12 +1,18 @@
 Name:           rasqal
 Version:        0.9.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        RDF Query Library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+ or ASL 2.0
 URL:            http://librdf.org/rasqal/
 Source:         http://download.librdf.org/source/%{name}-%{version}.tar.gz
+# Fix DSO linking error. Note that this is fixed in upstream trunk
+# http://bugs.librdf.org/mantis/view.php?id=347
+# But their fix requires an autoreconf cycle. We just do a
+# simple hack for the time being. This patch will be dropped
+# in the next version after 0.9.17
+Patch0:         %{name}-0.9.17-linking.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -37,6 +43,7 @@ Libraries, includes etc to develop with 
 
 %prep
 %setup -q
+%patch0 -p1 -b .linking.fix
 
 # hack to nuke rpaths
 %if "%{_libdir}" != "/usr/lib"
@@ -99,7 +106,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Jan 03 2010 Rex Dieter <rdieter at fedoraproject.org. - 0.9.17-1
+* Sat Feb 13 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.9.17-2
+- Fix DSO linking error RHBZ#564859
+- Remove rpath hack. Not needed anymore.
+
+* Sun Jan 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.9.17-1
 - rasqal-0.9.17
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.15-6