rpms/raptor/devel raptor-config-multilib.patch, NONE, 1.1 raptor.spec, 1.17, 1.18

[Orcan Ogetbil]

Author: oget

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

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/devel/raptor.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- raptor.spec	27 Jul 2009 02:47:27 -0000	1.17
+++ raptor.spec	29 Oct 2009 06:07:45 -0000	1.18
@@ -1,10 +1,12 @@
 Summary:       Raptor RDF Parser Toolkit for Redland
 Name:          raptor
 Version:       1.4.18
-Release:       4%{?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,7 @@ RDF/XML or N-Triples.
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
 
 # hack to nuke rpaths
 %if "%{_libdir}" != "/usr/lib"
@@ -72,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_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