- merged from DEVEL

Changed files:
    gdk-pixbuf2.spec -> 1.29

diff --git a/gdk-pixbuf2.spec b/gdk-pixbuf2.spec
index a484e4b5607a5ceca7005e7672f755499e1402bf..c71aacdb66370d9313f9c62bc6b91b331fda3450 100644 (file)
--- a/gdk-pixbuf2.spec
+++ b/gdk-pixbuf2.spec
@@ -8,18 +8,18 @@
 Summary:       An image loading and scaling library
 Summary(pl.UTF-8):     Biblioteka ładująca i skalująca obrazki
 Name:          gdk-pixbuf2
-Version:       2.24.1
-Release:       6
+Version:       2.26.0
+Release:       1
 License:       LGPL v2+
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-%{version}.tar.xz
-# Source0-md5: 72f39b34b20f68148c1609bd27415412
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-%{version}.tar.xz
+# Source0-md5: 1c186f9903a20e96587b9afb27944b40
 Patch0:                %{name}-png-nodep.patch
 URL:           http://developer.gnome.org/gdk-pixbuf/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.10
 BuildRequires: gettext-devel >= 0.17
-BuildRequires: glib2-devel >= 1:2.28.0
+BuildRequires: glib2-devel >= 1:2.32.0
 BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: gtk-doc >= 1.11
 BuildRequires: jasper-devel
@@ -34,7 +34,7 @@ BuildRequires:        rpmbuild(macros) >= 1.527
 BuildRequires: tar >= 1:1.22
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xz
-Requires:      glib2 >= 1:2.28.0
+Requires:      glib2 >= 1:2.32.0
 Suggests:      librsvg >= 2.31
 Conflicts:     gtk+2 < 2:2.21.3-1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,7 +64,7 @@ Summary:      Header files for gdk-pixbuf library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki gdk-pixbuf
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.28.0
+Requires:      glib2-devel >= 1:2.32.0
 Conflicts:     gtk+2-devel < 2:2.21.3-1
 
 %description devel
@@ -100,6 +100,7 @@ sed -i s#^io## po/LINGUAS
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-silent-rules \
        --enable-man \
        %{__enable_disable apidocs gtk-doc} \
        --with-html-dir=%{_gtkdocdir} \
@@ -164,6 +165,7 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gdk-pixbuf-csource
+%attr(755,root,root) %{_bindir}/gdk-pixbuf-pixdata
 %attr(755,root,root) %{_libdir}/libgdk_pixbuf-2.0.so
 %attr(755,root,root) %{_libdir}/libgdk_pixbuf_xlib-2.0.so
 %{_datadir}/gir-1.0/GdkPixbuf-2.0.gir