rpms/redland/devel redland.spec,1.15,1.16

[Rex Dieter]

Author: rdieter

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

Modified Files:
	redland.spec 
Log Message:
(mostly cosmetic changes only, not built)

* Fri May 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.7-7
- slighgly less ugly rpath hack
- cleanup %files



Index: redland.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redland/devel/redland.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- redland.spec	25 Feb 2009 19:31:58 -0000	1.15
+++ redland.spec	1 May 2009 15:55:14 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           redland
 Version:        1.0.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        RDF Application Framework
 
 Group:          System Environment/Libraries
@@ -19,9 +19,6 @@ BuildRequires:  sqlite-devel
 BuildRequires:  postgresql-devel
 BuildRequires:  gtk-doc
 
-# to avoid /usr/lib64 rpath on x86_64
-BuildRequires:  libtool
-
 %description
 Redland is a library that provides a high-level interface for RDF
 (Resource Description Framework) implemented in an object-based API.
@@ -44,6 +41,12 @@ Header files for development with Redlan
 %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 \
@@ -51,8 +54,7 @@ Header files for development with Redlan
   --with-raptor=system --with-rasqal=system --with-threestore=no \
   --disable-static
 
-# avoid getting /usr/lib64 rpath on x86_64 build
-make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %check
 make check
@@ -63,8 +65,6 @@ rm -rf $RPM_BUILD_ROOT
 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
@@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE.txt NEWS README
 %doc LICENSE-2.0.txt NOTICE
 %doc *.html
-%{_libdir}/librdf*.so.*
+%{_libdir}/librdf.so.0*
 %{_bindir}/rdfproc
 %{_bindir}/redland-db-upgrade
 %dir %{_datadir}/redland
@@ -87,20 +87,24 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/redland-config
-%{_libdir}/librdf*.so
+%{_libdir}/librdf.so
 %{_includedir}/redland.h
 %{_includedir}/librdf.h 
 %{_includedir}/rdf_*.h
 %{_mandir}/man1/redland-config.1*
 %{_libdir}/pkgconfig/redland.pc
 %{_datadir}/redland/Redland.i
-%{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/redland/
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri May 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.7-7
+- slighgly less ugly rpath hack
+- cleanup %%files
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild