(mostly cosmetic changes only, not built)

Fri May 01 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.9.15-5
- slightly less ugly rpath hacks
- cleanup %files

rasqal.spec

@@ -1,6 +1,6 @@
 Name:           rasqal
 Version:        0.9.15
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        RDF Query Library
 
 Group:          System Environment/Libraries
@@ -17,9 +17,6 @@ BuildRequires:  libxml2-devel
 # for the testsuite
 #BuildRequires:  perl(XML::DOM)
 
-# to avoid /usr/lib64 rpath on x86_64
-BuildRequires:  libtool
-
 %description
 Rasqal is a library providing full support for querying Resource
 Description Framework (RDF) including parsing query syntaxes, constructing
@@ -41,13 +38,17 @@ Libraries, includes etc to develop with the Rasqal RDF query language library.
 %prep
 %setup -q
 
+# hack to nuke rpaths
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
+
+
 %build
 
-# disable-static does not work if we override to use the system's libtool
 %configure --enable-release --with-raptor=system --disable-static
 
-# avoid getting /usr/lib64 rpath on x86_64 build
-make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %check
 #make check
@@ -61,8 +62,6 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man3
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
 
-# remove .a files that we now get because of overriding libtool
-find $RPM_BUILD_ROOT -name \*.a -exec rm {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,26 +72,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-
 %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE.txt NEWS README
 %doc LICENSE-2.0.txt NOTICE
 %doc *.html
 %{_bindir}/roqet
-%{_libdir}/librasqal*.so.*
+%{_libdir}/librasqal.so.0*
 %{_mandir}/man1/roqet.1*
 %{_mandir}/man3/librasqal.3*
 
 %files devel
 %defattr(-,root,root,-)
 %doc docs/README.html
-%{_libdir}/librasqal*.so
-%{_includedir}/*
+%{_libdir}/librasqal.so
+%{_includedir}/rasqal*
 %{_bindir}/rasqal-config
 %{_mandir}/man1/rasqal-config.1*
 %{_libdir}/pkgconfig/rasqal.pc
-%{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/rasqal/
 
 %changelog
+* Fri May 01 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.9.15-5
+- slightly less ugly rpath hacks
+- cleanup %%files
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.15-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild