rpms/gdk-pixbuf/devel gdk-pixbuf-0.22.0-multilib.patch, NONE, 1.1 gdk-pixbuf.spec, 1.10, 1.11

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/gdk-pixbuf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15714

Modified Files:
	gdk-pixbuf.spec 
Added Files:
	gdk-pixbuf-0.22.0-multilib.patch 
Log Message:
Check in multilib patch.


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/devel/gdk-pixbuf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gdk-pixbuf.spec	26 Jan 2007 03:15:28 -0000	1.10
+++ gdk-pixbuf.spec	26 Jan 2007 03:19:51 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		gdk-pixbuf
 Version:	0.22.0
-Release:	33%{?dist}
+Release:	34%{?dist}
 Epoch:		1
 Summary:	An image loading library used with GNOME
 License:	LGPL
@@ -130,6 +130,9 @@
 %{_datadir}/gnome/html/*
 
 %changelog
+* Thu Jan 25 2007 Kevin Fenzi <kevin at tummy.com> - 1:0.22.0-34
+- Check in multilib patch. 
+
 * Thu Jan 25 2007 Kevin Fenzi <kevin at tummy.com> - 1:0.22.0-33
 - Add multilib handling patch (thanks mclasen at redhat.com)
 - Add .pc file.