rpms/gdk-pixbuf/FC-6 gdk-pixbuf-0.22.0-multilib.patch, NONE, 1.1 gdk-pixbuf.spec, 1.7, 1.8

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/gdk-pixbuf/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15932

Modified Files:
	gdk-pixbuf.spec 
Added Files:
	gdk-pixbuf-0.22.0-multilib.patch 
Log Message:
Add multilib handling patch (thanks mclasen at redhat.com)
Add .pc file.


gdk-pixbuf-0.22.0-multilib.patch:

--- NEW FILE gdk-pixbuf-0.22.0-multilib.patch ---
--- gdk-pixbuf-0.22.0/Makefile.am.multilib	2000-08-27 19:06:54.000000000 -0400
+++ gdk-pixbuf-0.22.0/Makefile.am	2007-01-11 11:15:25.000000000 -0500
@@ -46,3 +46,6 @@
 	     -e 's?\@GNOMECANVASPIXBUF_LIBS\@?$(GNOMECANVASPIXBUF_LIBS)?g' \
 	        < $(srcdir)/gnomecanvaspixbufConf.sh.in > gnomecanvaspixbufConf.tmp \
 	&& mv gnomecanvaspixbufConf.tmp gnomecanvaspixbufConf.sh
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA= gdk-pixbuf.pc
--- gdk-pixbuf-0.22.0/gdk-pixbuf-config.in.multilib	2001-10-09 16:49:55.000000000 -0400
+++ gdk-pixbuf-0.22.0/gdk-pixbuf-config.in	2007-01-11 11:15:25.000000000 -0500
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+[ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config"
+prefix=`${PKG_CONFIG} --variable prefix gdk-pixbuf`
+exec_prefix=`${PKG_CONFIG} --variable exec_prefix gdk-pixbuf`
 exec_prefix_set=no
 
 usage="\
@@ -39,12 +40,10 @@
       echo @GDK_PIXBUF_VERSION@
       ;;
     --cflags)
-      includes=-I at includedir@/gdk-pixbuf-1.0
-      echo $includes `gtk-config --cflags`
+      ${PKG_CONFIG} --cflags gdk-pixbuf
       ;;
     --libs)
-      libdirs=-L at libdir@
-      echo $libdirs -lgdk_pixbuf `gtk-config --libs`
+      ${PKG_CONFIG} --libs gdk-pixbuf
       ;;
     *)
       echo "${usage}" 1>&2
--- gdk-pixbuf-0.22.0/gdk-pixbuf.pc.in.multilib	2007-01-11 11:17:40.000000000 -0500
+++ gdk-pixbuf-0.22.0/gdk-pixbuf.pc.in	2007-01-11 11:17:34.000000000 -0500
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GdkPixbuf
+Description: Image loading and scaling
+Version: @VERSION@
+Requires: gtk+ gmodule
+Libs: -L${libdir} -lgdk_pixbuf
+Cflags: -I${includedir}/gdk-pixbuf-1.0
+
--- gdk-pixbuf-0.22.0/configure.in.multilib	2007-01-11 11:15:25.000000000 -0500
+++ gdk-pixbuf-0.22.0/configure.in	2007-01-11 11:15:25.000000000 -0500
@@ -372,6 +372,7 @@
 gdk-pixbuf/gdk-pixbuf-features.h
 gdk-pixbuf/pixops/Makefile
 gdk-pixbuf-config
+gdk-pixbuf.pc
 demo/Makefile
 doc/Makefile
 ])


Index: gdk-pixbuf.spec
===================================================================
RCS file: /cvs/extras/rpms/gdk-pixbuf/FC-6/gdk-pixbuf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdk-pixbuf.spec	28 Aug 2006 04:20:33 -0000	1.7
+++ gdk-pixbuf.spec	26 Jan 2007 03:31:54 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		gdk-pixbuf
 Version:	0.22.0
-Release:	31%{?dist}
+Release:	32%{?dist}
 Epoch:		1
 Summary:	An image loading library used with GNOME
 License:	LGPL
@@ -26,6 +26,8 @@
 Patch15:	gdk-pixbuf-0.22.0-xpm-whc-overflow.patch
 # Modular X moves rgb.txt
 Patch16:	gdk-pixbuf-0.22.0-rgb.patch
+# multilib fixes
+Patch17:	gdk-pixbuf-0.22.0-multilib.patch
 
 URL:		http://developer.gnome.org/arch/imaging/gdkpixbuf.html
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +48,7 @@
 Summary:	Files needed for developing apps to work with the GdkPixBuf library
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	pkgconfig
 
 %description devel
 This package contains the libraries, header files, and include files
@@ -54,6 +57,7 @@
 
 
 %prep
+
 %setup -q
 
 %patch2 -p1 -b .gmodulehack
@@ -72,6 +76,7 @@
 %patch14 -p1 -b .xpm-whc-overflow
 %patch15 -p1 -b .xpm-largecol
 %patch16 -p1 -b .rgb
+%patch17 -p1 -b .multilib
 
 perl -p -i.bak -e 's/gmodule.h/gmodule-local.h/g; s/g_module/local_hack_g_module/g; s/GModule/LocalHackGModule/g; s/G_MODULE/LOCAL_HACK_G_MODULE/g' gdk-pixbuf/gdk-pixbuf-io.c gdk-pixbuf/gdk-pixbuf-io.h
 perl -pi -e 's/-static//g' gdk-pixbuf/local-hack-gmodule/Makefile
@@ -103,7 +108,7 @@
 %clean
 rm -rf %{buildroot}
 
-%post   -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
@@ -120,10 +125,15 @@
 %{_bindir}/gdk-pixbuf-config
 %{_libdir}/*so
 %{_libdir}/*Conf.sh
+%{_libdir}/pkgconfig/gdk-pixbuf.pc
 %{_datadir}/aclocal/*
 %{_datadir}/gnome/html/*
 
 %changelog
+* Thu Jan 25 2007 Kevin Fenzi <kevin at tummy.com> - 1:0.22.0-32
+- Add multilib handling patch (thanks mclasen at redhat.com)
+- Add .pc file.
+
 * Mon Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1:0.22.0-31
 - Rebuild for FC6