rpms/raptor/F-10 raptor-config-multilib.patch, NONE, 1.1 raptor.spec, 1.14, 1.15

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/raptor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23793

Modified Files:
	raptor.spec 
Added Files:
	raptor-config-multilib.patch 
Log Message:
* Thu Oct 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.18-5
- Fix multilib conflict (RHBZ#477342)


raptor-config-multilib.patch:
 raptor-config.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE raptor-config-multilib.patch ---
diff -rupN raptor-1.4.18.old/src/raptor-config.in raptor-1.4.18/src/raptor-config.in
--- raptor-1.4.18.old/src/raptor-config.in	2007-01-05 23:02:00.000000000 -0500
+++ raptor-1.4.18/src/raptor-config.in	2009-10-29 01:47:57.000000000 -0400
@@ -130,11 +130,11 @@ if test "$echo_options" = "yes"; then
   done
 fi
 if test "$echo_libs" = "yes"; then
-  echo -L at libdir@ -lraptor
+  pkg-config --libs raptor
 fi
 if test "$echo_libtool_libs" = "yes"; then
-  echo @libdir@/@RAPTOR_LIBTOOLLIBS@
+  echo
 fi
 if test "$echo_private_libs" = "yes"; then
-  echo @LIBS@
+  pkg-config --libs --static raptor
 fi


Index: raptor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/raptor/F-10/raptor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- raptor.spec	8 Jul 2008 13:07:10 -0000	1.14
+++ raptor.spec	29 Oct 2009 16:32:13 -0000	1.15
@@ -1,10 +1,12 @@
 Summary:       Raptor RDF Parser Toolkit for Redland
 Name:          raptor
 Version:       1.4.18
-Release:       1%{?dist}
+Release:       5%{?dist}
 License:       LGPLv2+ or ASL 2.0
 Group:         System Environment/Libraries
 Source:        http://download.librdf.org/source/raptor-%{version}.tar.gz
+# Make the raptor-config file multilib friendly (RHBZ#477342)
+Patch0:        raptor-config-multilib.patch
 URL:           http://librdf.org/raptor/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel libxslt-devel curl-devel
@@ -27,6 +29,12 @@ RDF/XML or N-Triples.
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
+
+# hack to nuke rpaths
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
 
 %build
 %configure --disable-static
@@ -36,7 +44,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.{a,la}
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,23 +57,38 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README
 %doc %{_mandir}/man1/rapper.1*
-%{_libdir}/lib*.so.*
+%{_libdir}/libraptor.so.1*
 %{_bindir}/rapper
 
 
 %files devel
 %defattr(-, root, root)
-%doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README
-%doc INSTALL.html
-%doc %{_mandir}/man1/raptor-config.1*
-%doc %{_mandir}/man3/libraptor.3*
-%doc %{_datadir}/gtk-doc/html/raptor
-%{_libdir}/lib*.so
+# include instuctions on how to build from source? omit for now, flog
+# me with a wet noodle if I'm wrong  -- Rex
+#doc INSTALL.html
+%{_mandir}/man1/raptor-config.1*
+%{_mandir}/man3/libraptor.3*
+%doc %{_datadir}/gtk-doc/html/raptor/
+%{_libdir}/libraptor.so
 %{_libdir}/pkgconfig/raptor.pc
-%{_prefix}/include/*
+%{_includedir}/raptor.h
 %{_bindir}/raptor-config
 
 %changelog
+* Thu Oct 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.18-5
+- Fix multilib conflict (RHBZ#477342)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri May 01 2009 Rex Dieter <rdieter at fedoraproject.org> 1.4.18-3
+- nuke rpaths
+- touchup %%files
+- -devel: omit dup'd %%doc's included in main pkg
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jul 08 2008 Anthony Green <green at redhat.com> 1.4.18-1
 - Update sources.