rpms/libwmf/devel libwmf-0.2.8.4-pixbufloaderdir.patch, NONE, 1.1 libwmf.spec, 1.40, 1.41

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/libwmf/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8781

Modified Files:
	libwmf.spec 
Added Files:
	libwmf-0.2.8.4-pixbufloaderdir.patch 
Log Message:
Adapt to standalone gdk-pixbuf


libwmf-0.2.8.4-pixbufloaderdir.patch:
 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libwmf-0.2.8.4-pixbufloaderdir.patch ---
diff -up libwmf-0.2.8.4/configure.ac.pixbufloaderdir libwmf-0.2.8.4/configure.ac
--- libwmf-0.2.8.4/configure.ac.pixbufloaderdir	2010-06-28 23:35:06.227167269 -0400
+++ libwmf-0.2.8.4/configure.ac	2010-06-28 23:36:00.948420306 -0400
@@ -744,8 +744,8 @@ GDK_PIXBUF_DIR=""
 
 if test $LIBWMF_BUILDSTYLE != lite; then
 	PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[
-		GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
-		GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders"
+		GDK_PIXBUF_VERSION=`$PKG_CONFIG --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0`
+		GDK_PIXBUF_DIR="gdk-pixbuf-2.0/$GDK_PIXBUF_VERSION/loaders"
 		wmf_gdk_pixbuf=yes
 	],[	wmf_gdk_pixbuf=no
 	])


Index: libwmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwmf/devel/libwmf.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- libwmf.spec	19 Apr 2010 09:29:44 -0000	1.40
+++ libwmf.spec	29 Jun 2010 03:40:41 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Windows MetaFile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 22%{?dist}
+Release: 23%{?dist}
 Group: System Environment/Libraries
 #libwmf is under the LGPLv2+, however...
 #1. The tarball contains an old version of the urw-fonts under GPL+.
@@ -32,6 +32,9 @@ Patch6: libwmf-0.2.8.4-reducesymbols.pat
 #CVE-2009-1364, Use-after-free vulnerability in the modified embedded GD
 #library
 Patch7: libwmf-0.2.8.4-useafterfree.patch
+# adapt to standalone gdk-pixbuf
+Patch8: libwmf-0.2.8.4-pixbufloaderdir.patch
+
 Requires: urw-fonts
 Requires: %{name}-lite = %{version}-%{release}
 Requires(post): %{_bindir}/update-gdk-pixbuf-loaders
@@ -69,6 +72,7 @@ using libwmf.
 %patch5 -p1 -b .intoverflow
 %patch6 -p1 -b .reducesymbols.patch
 %patch7 -p1 -b .useafterfree.patch
+%patch8 -p1 -b .pixbufloaderdir
 f=README ; iconv -f iso-8859-2 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 %build
@@ -86,8 +90,8 @@ export tagname=CC
 make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/loaders/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/loaders/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.la
 rm -rf $RPM_BUILD_ROOT%{_includedir}/libwmf/gd
 find doc -name "Makefile*" -exec rm {} \;
 #we're carrying around duplicate fonts
@@ -97,13 +101,13 @@ sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf
 
 %post
 /sbin/ldconfig
-%{_bindir}/update-gdk-pixbuf-loaders %{_host} &>/dev/null || :
+gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
 
 %post lite -p /sbin/ldconfig
 
 %postun 
 /sbin/ldconfig
-%{_bindir}/update-gdk-pixbuf-loaders %{_host} &>/dev/null || :
+gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
 
 %postun lite -p /sbin/ldconfig
 
@@ -111,7 +115,7 @@ sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_libdir}/libwmf-*.so.*
-%{_libdir}/gtk-2.0/*/loaders/*.so
+%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.so
 %{_bindir}/wmf2svg
 %{_bindir}/wmf2gd
 %{_bindir}/wmf2eps
@@ -140,6 +144,9 @@ sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jun 28 2010 Matthias Clasen <mclasen at redhat.com> - 0.2.8.4-23
+- Adapt to standalone gdk-pixbuf
+
 * Fri Apr 16 2010 Caolán McNamara <caolanm at redhat.com> - 0.2.8.4-22
 - Clarify licences