Update to 2.36.6

[packages/gdk-pixbuf2.git] / gdk-pixbuf2.spec

diff --git a/gdk-pixbuf2.spec b/gdk-pixbuf2.spec
index 6e1b07d62f8c678fb189d7517415382718c08367..61e287469c3b9c4f72f7d36a8959a123badb4a4a 100644 (file)
--- a/gdk-pixbuf2.spec
+++ b/gdk-pixbuf2.spec
@@ -1,27 +1,28 @@
+# TODO: consider -x11 subpackages
 #
 # Conditional build:
 %bcond_without apidocs         # do not build and package API docs
-#
+
 %define                abiver          2.10.0
-#
 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:       2
+Version:       2.36.6
+Release:       1
 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/
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.36/gdk-pixbuf-%{version}.tar.xz
+# Source0-md5: 5dd53760750670d27c194ff6ace7eb51
+Patch0:                %{name}-png-nodep.patch
+URL:           https://developer.gnome.org/gdk-pixbuf/
 BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.10
-BuildRequires: gettext-devel >= 0.17
-BuildRequires: glib2-devel >= 1:2.25.9
-BuildRequires: gobject-introspection-devel >= 0.9.5
-BuildRequires: gtk-doc >= 1.11
+BuildRequires: automake >= 1:1.11
+BuildRequires: docbook-dtd43-xml
+BuildRequires: docbook-style-xsl
+BuildRequires: gettext-tools >= 0.19
+BuildRequires: glib2-devel >= 1:2.37.6
+BuildRequires: gobject-introspection-devel >= 0.10.0
+BuildRequires: gtk-doc >= 1.20
 BuildRequires: jasper-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -30,8 +31,11 @@ BuildRequires:       libtool >= 2:2.2.6
 BuildRequires: libxslt-progs
 BuildRequires: perl-devel
 BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.527
+BuildRequires: tar >= 1:1.22
 BuildRequires: xorg-lib-libX11-devel
-Requires:      glib2 >= 1:2.25.9
+BuildRequires: xz
+Requires:      glib2 >= 1:2.37.6
 Suggests:      librsvg >= 2.31
 Conflicts:     gtk+2 < 2:2.21.3-1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,7 +65,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.25.9
+Requires:      glib2-devel >= 1:2.37.6
 Conflicts:     gtk+2-devel < 2:2.21.3-1
 
 %description devel
@@ -75,6 +79,9 @@ Summary:      gdk-pixbuf API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki gdk-pixbuf
 Group:         Documentation
 Conflicts:     gtk+2-apidocs < 2:2.21.3-1
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description apidocs
 API documentation for gdk-pixbuf library.
@@ -85,22 +92,21 @@ 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
 
 %build
 %{__gettextize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-silent-rules \
        --enable-man \
        %{__enable_disable apidocs gtk-doc} \
        --with-html-dir=%{_gtkdocdir} \
-       --with-libjasper
+       --with-libjasper \
+       --with-x11
 %{__make}
 
 %install
@@ -122,7 +128,11 @@ touch $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/%{abiver}/loaders.cache
 
 %{!?with_apidocs:%{__rm} -r $RPM_BUILD_ROOT%{_gtkdocdir}}
 
-%find_lang gdk-pixbuf %{name}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr@ije,sr@ijekavian}
+# not supported by glibc
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/io
+
+%find_lang gdk-pixbuf %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -136,6 +146,8 @@ umask 022
 /sbin/ldconfig
 if [ "$1" != "0" ]; then
        umask 022
+       # the $1 check does not match for multilib installs, check also that the binary still exists
+       [ ! -x %{_bindir}/gdk-pixbuf-query-loaders%{pqext} ] || \
        %{_bindir}/gdk-pixbuf-query-loaders%{pqext} --update-cache || :
 fi
 
@@ -143,6 +155,7 @@ fi
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS
 %attr(755,root,root) %{_bindir}/gdk-pixbuf-query-loaders%{pqext}
+%attr(755,root,root) %{_bindir}/gdk-pixbuf-thumbnailer
 %attr(755,root,root) %{_libdir}/libgdk_pixbuf-2.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgdk_pixbuf-2.0.so.0
 %attr(755,root,root) %{_libdir}/libgdk_pixbuf_xlib-2.0.so.*.*.*
@@ -152,12 +165,14 @@ fi
 %ghost %{_libdir}/gdk-pixbuf-2.0/%{abiver}/loaders.cache
 %dir %{_libdir}/gdk-pixbuf-2.0/%{abiver}/loaders
 %attr(755,root,root) %{_libdir}/gdk-pixbuf-2.0/%{abiver}/loaders/libpixbufloader-*.so
+%{_datadir}/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer
 %{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib
 %{_mandir}/man1/gdk-pixbuf-query-loaders.1*
 
 %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