- added nopngdep patch to avoid unnecessary libpng pkgconfig dependency for gdk-pixbu...

- release 2

Changed files:
    gdk-pixbuf2-nopngdep.patch -> 1.1
    gdk-pixbuf2.spec -> 1.10

diff --git a/gdk-pixbuf2-nopngdep.patch b/gdk-pixbuf2-nopngdep.patch
new file mode 100644 (file)
index 0000000..1e2bcd4
--- /dev/null
+++ b/gdk-pixbuf2-nopngdep.patch
@@ -0,0 +1,42 @@
+--- gdk-pixbuf-2.22.1/configure.ac.orig        2010-11-06 00:33:52.000000000 +0100
++++ gdk-pixbuf-2.22.1/configure.ac     2010-11-12 08:18:07.347103290 +0100
+@@ -598,7 +598,6 @@
+       if $PKG_CONFIG --exists $l ; then
+         AC_MSG_RESULT(yes)
+         PNG='png'
+-        PNG_DEP_CFLAGS_PACKAGES=$l
+         LIBPNG=`$PKG_CONFIG --libs $l`
+         break
+       else
+@@ -919,9 +918,8 @@
+ GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
+ GDK_PIXBUF_EXTRA_CFLAGS=
+ GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
++GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
+ 
+-AC_SUBST(PNG_DEP_CFLAGS_PACKAGES)
+ AC_SUBST(GDK_PIXBUF_PACKAGES)
+ AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
+ AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS)
+--- gdk-pixbuf-2.22.1/gdk-pixbuf-2.0-uninstalled.pc.in.orig    2010-08-10 03:26:57.000000000 +0200
++++ gdk-pixbuf-2.22.1/gdk-pixbuf-2.0-uninstalled.pc.in 2010-11-12 08:19:30.375102452 +0100
+@@ -6,6 +6,6 @@
+ Name: GdkPixbuf Uninstalled
+ Description: Image loading and scaling, Not Installed
+ Version: @VERSION@
+-Requires: gobject-2.0 gmodule-2.0 @PNG_DEP_CFLAGS_PACKAGES@
++Requires: gobject-2.0 gmodule-2.0
+ Libs: ${pc_top_builddir}/${pcfiledir}/gdk-pixbuf/libgdk_pixbuf-@GDK_PIXBUF_API_VERSION@.la @GDK_PIXBUF_EXTRA_LIBS@
+ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_PIXBUF_EXTRA_CFLAGS@
+--- gdk-pixbuf-2.22.1/gdk-pixbuf-2.0.pc.in.orig        2010-09-10 14:58:06.000000000 +0200
++++ gdk-pixbuf-2.22.1/gdk-pixbuf-2.0.pc.in     2010-11-12 08:19:10.523101613 +0100
+@@ -11,7 +11,7 @@
+ Name: GdkPixbuf
+ Description: Image loading and scaling
+ Version: @VERSION@
+-Requires: gobject-2.0 gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
++Requires: gobject-2.0 gmodule-no-export-2.0
+ Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
+ Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
+ 

diff --git a/gdk-pixbuf2.spec b/gdk-pixbuf2.spec
index 3898e6c768c6450a8aa2e71207407b49e8d81db7..09f6f508f2b55d32fae2f1133e5e95e7a06eff79 100644 (file)
--- a/gdk-pixbuf2.spec
+++ b/gdk-pixbuf2.spec
@@ -8,12 +8,13 @@ Summary:      An image loading and scaling library
 Summary(pl.UTF-8):     Biblioteka ładująca i skalująca obrazki
 Name:          gdk-pixbuf2
 Version:       2.22.1
-Release:       1
+Release:       2
 License:       LGPL v2+
 Group:         X11/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.22/gdk-pixbuf-%{version}.tar.bz2
 # Source0-md5: 716c4593ead3f9c8cca63b8b1907a561
 Patch0:                gobject-introspection.patch
+Patch1:                %{name}-nopngdep.patch
 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.10
@@ -83,6 +84,7 @@ Dokumentacja API biblioteki gdk-pixbuf.
 %prep
 %setup -q -n gdk-pixbuf-%{version}
 %patch0 -p1
+%patch1 -p1
 sed -i s#^io## po/LINGUAS
 rm po/io.po