- updated to 2.90.4

Changed files:
    gtk+3.spec -> 1.4

diff --git a/gtk+3.spec b/gtk+3.spec
index fca11947c6a779cafa9eb3de524cac35dad9f650..29e89aebd503b8306e0a68a7c8ba9c2305837330 100644 (file)
--- a/gtk+3.spec
+++ b/gtk+3.spec
@@ -19,12 +19,12 @@ Summary(it.UTF-8):  Il toolkit per GIMP
 Summary(pl.UTF-8):     GIMP Toolkit
 Summary(tr.UTF-8):     GIMP ToolKit arayüz kitaplığı
 Name:          gtk+3
-Version:       2.90.3
+Version:       2.90.4
 Release:       1
 License:       LGPL v2+
 Group:         X11/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.90/gtk+-%{version}.tar.bz2
-# Source0-md5: e860c3b069289acca6cefb9d21aa0c50
+# Source0-md5: c70b0c0617b02de3d1ff24a8b1fad5e6
 URL:           http://www.gtk.org/
 BuildRequires: atk-devel >= 1:1.30.0
 BuildRequires: autoconf >= 2.62
@@ -33,15 +33,12 @@ BuildRequires:      cairo-devel >= 1.6.0
 %{?with_cups:BuildRequires:    cups-devel}
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-style-xsl
+BuildRequires: gdk-pixbuf2-devel >= 2.21.0
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.25.9
 BuildRequires: gobject-introspection-devel >= 0.6.14
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.11}
 BuildRequires: gtk-doc-automake >= 1.11
-BuildRequires: jasper-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: libtiff-devel
 BuildRequires: libtool >= 1:1.4.2-9
 BuildRequires: libxml2-progs >= 1:2.6.31
 BuildRequires: libxslt-progs >= 1.1.20
@@ -63,7 +60,8 @@ BuildRequires:        xorg-lib-libXrandr-devel >= 1.3.0
 BuildRequires: xorg-lib-libXrender-devel
 Requires:      atk >= 1:1.30.0
 Requires:      cairo >= 1.6.0
-Requires:      glib2 >= 1:2.25.8
+Requires:      gdk-pixbuf2 >= 2.21.0
+Requires:      glib2 >= 1:2.25.9
 Requires:      pango >= 1:1.26.0
 Requires:      xorg-lib-libXrandr >= 1.3.0
 %if %{with cups}
@@ -136,7 +134,8 @@ Summary(tr.UTF-8):  GIMP araç takımı ve çizim takımı
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      atk-devel >= 1:1.30.0
-Requires:      glib2-devel >= 1:2.25.8
+Requires:      gdk-pixbuf2-devel >= 2.21.0
+Requires:      glib2-devel >= 1:2.25.9
 Requires:      pango-devel >= 1:1.26.0
 Requires:      shared-mime-info
 Requires:      xorg-lib-libX11-devel
@@ -225,7 +224,6 @@ rm m4/introspection.m4
        --%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \
        --with-gdktarget=x11 \
        --with-html-dir=%{_gtkdocdir} \
-       --with-libjasper \
        --with-xinput=yes
 %{__make}
 
@@ -236,7 +234,6 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{abivers}/gdk-pixbuf.loaders
 touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{abivers}/gtk.immodules
 
 cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -248,7 +245,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{abivers}/*/*.{a,la}
 %if "%{_lib}" != "lib"
 # We need to have 32-bit and 64-bit binaries as they have hardcoded LIBDIR.
 # (needed when multilib is used)
-mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0{,%{pqext}}
 mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0{,%{pqext}}
 %endif
 
@@ -257,7 +253,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{az_IR,io}
 
 %find_lang %{name} --all-name
 
-%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/{gdk3,gdk-pixbuf3,gtk3}}
+%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/{gdk3,gtk3}}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -281,7 +277,6 @@ exit 0
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
-%attr(755,root,root) %{_bindir}/gdk-pixbuf-query-loaders-3.0%{pqext}
 %attr(755,root,root) %{_bindir}/gtk-query-immodules-3.0%{pqext}
 %attr(755,root,root) %{_bindir}/gtk-update-icon-cache-3.0
 %attr(755,root,root) %{_bindir}/gtk3-demo
@@ -289,10 +284,6 @@ exit 0
 %attr(755,root,root) %ghost %{_libdir}/libgailutil-3.0.so.0
 %attr(755,root,root) %{_libdir}/libgdk-x11-3.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgdk-x11-3.0.so.0
-%attr(755,root,root) %{_libdir}/libgdk_pixbuf-3.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgdk_pixbuf-3.0.so.0
-%attr(755,root,root) %{_libdir}/libgdk_pixbuf_xlib-3.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgdk_pixbuf_xlib-3.0.so.0
 %attr(755,root,root) %{_libdir}/libgtk-x11-3.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgtk-x11-3.0.so.0
 
@@ -301,19 +292,15 @@ exit 0
 %dir %{_libdir}/gtk-3.0/%{abivers}
 %dir %{_libdir}/gtk-3.0/%{abivers}/engines
 %dir %{_libdir}/gtk-3.0/%{abivers}/immodules
-%dir %{_libdir}/gtk-3.0/%{abivers}/loaders
 %dir %{_libdir}/gtk-3.0/%{abivers}/printbackends
 %attr(755,root,root) %{_libdir}/gtk-3.0/modules/libferret.so
 %attr(755,root,root) %{_libdir}/gtk-3.0/modules/libgail.so
-%ghost %{_libdir}/gtk-3.0/%{abivers}/gdk-pixbuf.loaders
 %ghost %{_libdir}/gtk-3.0/%{abivers}/gtk.immodules
 %attr(755,root,root) %{_libdir}/gtk-3.0/%{abivers}/engines/libpixmap.so
 %attr(755,root,root) %{_libdir}/gtk-3.0/%{abivers}/immodules/im-*.so
-%attr(755,root,root) %{_libdir}/gtk-3.0/%{abivers}/loaders/libpixbufloader-*.so
 %attr(755,root,root) %{_libdir}/gtk-3.0/%{abivers}/printbackends/libprintbackend-file.so
 %attr(755,root,root) %{_libdir}/gtk-3.0/%{abivers}/printbackends/libprintbackend-lpr.so
 %{_libdir}/girepository-1.0/Gdk-3.0.typelib
-%{_libdir}/girepository-1.0/GdkPixbuf-3.0.typelib
 %{_libdir}/girepository-1.0/GdkX11-3.0.typelib
 %{_libdir}/girepository-1.0/Gtk-3.0.typelib
 
@@ -330,24 +317,18 @@ exit 0
 %dir %{_datadir}/themes/Raleigh
 %dir %{_datadir}/themes/Raleigh/gtk-*
 %{_datadir}/themes/Raleigh/gtk-*/gtkrc
-%{_mandir}/man1/gdk-pixbuf-query-loaders-3.0.1*
 %{_mandir}/man1/gtk-query-immodules-3.0.1*
 %{_mandir}/man1/gtk-update-icon-cache-3.0.1*
 
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog
-%attr(755,root,root) %{_bindir}/gdk-pixbuf-csource-3.0
 %attr(755,root,root) %{_bindir}/gtk-builder-convert-3.0
 %attr(755,root,root) %{_libdir}/libgailutil-3.0.so
 %attr(755,root,root) %{_libdir}/libgdk-x11-3.0.so
-%attr(755,root,root) %{_libdir}/libgdk_pixbuf-3.0.so
-%attr(755,root,root) %{_libdir}/libgdk_pixbuf_xlib-3.0.so
 %attr(755,root,root) %{_libdir}/libgtk-x11-3.0.so
 %{_libdir}/libgailutil-3.0.la
 %{_libdir}/libgdk-x11-3.0.la
-%{_libdir}/libgdk_pixbuf-3.0.la
-%{_libdir}/libgdk_pixbuf_xlib-3.0.la
 %{_libdir}/libgtk-x11-3.0.la
 %{_includedir}/gail-3.0
 %{_includedir}/gtk-3.0
@@ -355,16 +336,12 @@ exit 0
 %{_libdir}/gtk-3.0/include
 %{_pkgconfigdir}/gail-3.0.pc
 %{_pkgconfigdir}/gdk-3.0.pc
-%{_pkgconfigdir}/gdk-pixbuf-3.0.pc
-%{_pkgconfigdir}/gdk-pixbuf-xlib-3.0.pc
 %{_pkgconfigdir}/gdk-x11-3.0.pc
 %{_pkgconfigdir}/gtk+-3.0.pc
 %{_pkgconfigdir}/gtk+-unix-print-3.0.pc
 %{_pkgconfigdir}/gtk+-x11-3.0.pc
-%{_mandir}/man1/gdk-pixbuf-csource-3.0.1*
 %{_mandir}/man1/gtk-builder-convert-3.0.1*
 %{_datadir}/gir-1.0/Gdk-3.0.gir
-%{_datadir}/gir-1.0/GdkPixbuf-3.0.gir
 %{_datadir}/gir-1.0/GdkX11-3.0.gir
 %{_datadir}/gir-1.0/Gtk-3.0.gir
 
@@ -373,8 +350,6 @@ exit 0
 %defattr(644,root,root,755)
 %{_libdir}/libgailutil-3.0.a
 %{_libdir}/libgdk-x11-3.0.a
-%{_libdir}/libgdk_pixbuf-3.0.a
-%{_libdir}/libgdk_pixbuf_xlib-3.0.a
 %{_libdir}/libgtk-x11-3.0.a
 %endif
 
@@ -383,7 +358,6 @@ exit 0
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gail-libgail-util3
 %{_gtkdocdir}/gdk3
-%{_gtkdocdir}/gdk-pixbuf3
 %{_gtkdocdir}/gtk3
 %endif