rpms/libxml/devel libxml-1.8.17-multiarch.patch, NONE, 1.1 libxml.spec, 1.4, 1.5

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/pkgs/rpms/libxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20717

Modified Files:
	libxml.spec 
Added Files:
	libxml-1.8.17-multiarch.patch 
Log Message:
fix multiarch conflict in xml-config (#342501)

libxml-1.8.17-multiarch.patch:

--- NEW FILE libxml-1.8.17-multiarch.patch ---
--- libxml-1.8.17/xml-config.in	2007-10-25 13:39:44.000000000 +0100
+++ libxml-1.8.17/xml-config.in	2007-10-25 13:40:31.000000000 +0100
@@ -3,7 +3,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
-libdir=@libdir@
+libdir=`pkg-config --variable=libdir libxml`
 
 usage()
 {


Index: libxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml/devel/libxml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libxml.spec	30 Aug 2007 14:01:14 -0000	1.4
+++ libxml.spec	25 Oct 2007 13:56:28 -0000	1.5
@@ -2,12 +2,13 @@
 Summary:	Old libXML library for Gnome-1 application compatibility
 Epoch:		1
 Version:	1.8.17
-Release:	17%{?dist}
+Release:	18%{?dist}
 License:	LGPLv2+ or W3C
 Group:		Development/Libraries
 URL:		http://veillard.com/XML/
 Source:		ftp://xmlsoft.org/libxml/old/libxml-%{version}.tar.gz
 Patch0:		libxml-1.8.17-open-mode.patch
+Patch1:		libxml-1.8.17-multiarch.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -24,6 +25,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -47,12 +49,12 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README COPYING.LIB TODO
 %{_libdir}/libxml.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/xml-config
 %{_datadir}/gnome-xml/
 %{_includedir}/gnome-xml/
@@ -62,6 +64,9 @@
 %exclude %{_libdir}/libxml.la
 
 %changelog
+* Thu Oct 25 2007 Paul Howarth <paul at city-fan.org> 1:1.8.17-18
+- fix multiarch conflict in xml-config (#342501)
+
 * Thu Aug 30 2007 Paul Howarth <paul at city-fan.org> 1:1.8.17-17
 - rebuild for BuildID inclusion
   (http://fedoraproject.org/wiki/Releases/FeatureBuildId)