- Fix DSO linking error RHBZ#564859

- Remove rpath hack. Not needed anymore.
This commit is contained in:
Orcan Ogetbil 2010-02-14 20:59:54 +00:00
parent 8f3f9690b3
commit ebdbf6cc92
2 changed files with 25 additions and 2 deletions

View File

@ -0,0 +1,12 @@
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 = \

View File

@ -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 the Rasqal RDF query language library.
%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@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@fedoraproject.org> - 0.9.17-1
- rasqal-0.9.17
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.15-6