2.90.4

3 files changed, 11 insertions, 27 deletions

diff --git a/.cvsignore b/.cvsignore
index 30b1df5..bc6bad8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gtk+-2.90.3.tar.bz2
+gtk+-2.90.4.tar.bz2
diff --git a/gtk3.spec b/gtk3.spec
index 48a9394..e2b26bd 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -10,7 +10,7 @@
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk3
-Version: 2.90.3
+Version: 2.90.4
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -32,17 +32,14 @@ Patch4: 0001-Prevent-concurrent-use-of-GTK-2-and-3.patch
 
 
 BuildRequires: atk-devel >= %{atk_version}
-BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: libtiff-devel
-BuildRequires: libjpeg-devel
-BuildRequires: jasper-devel
+BuildRequires: cairo-devel >= %{cairo_version}
+BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: gdk-pixbuf2-devel
 BuildRequires: libXi-devel
-BuildRequires: libpng-devel >= %{libpng_version}
 BuildRequires: gettext
 BuildRequires: gtk-doc
 BuildRequires: cups-devel
-BuildRequires: cairo-devel >= %{cairo_version}
 BuildRequires: libXrandr-devel >= %{xrandr_version}
 BuildRequires: libXrender-devel
 BuildRequires: libXcursor-devel
@@ -60,8 +57,6 @@ Requires: hicolor-icon-theme
 Requires(post): glib2 >= %{glib2_version}
 Requires(post): atk >= %{atk_version}
 Requires(post): pango >= %{pango_version}
-# and these for gdk-pixbuf-query-loaders
-Requires(post): libtiff >= 3.6.1
 Requires: libXrandr >= %{xrandr_version}
 
 %description
@@ -122,17 +117,13 @@ widget toolkit.
 %setup -q -n gtk+-%{version}
 %patch0 -p1 -b .system-python
 %patch1 -p1 -b .fresh-tooltips
-%patch2 -p1 -b .remove-connecting-reason
 %patch3 -p1 -b .window-dragging
-%patch4 -p1 -b .mixed-linking
 
 %build
 %configure --with-xinput                \
            --disable-gtk-doc            \
            --disable-rebuilds           \
-           --enable-introspection       \
-           --with-libjasper             \
-           --with-included-loaders=png
+           --enable-introspection
 
 # fight unused direct deps
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -147,8 +138,7 @@ awk '/^Overview of Changes/ { seen+=1 }
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT        \
-             RUN_QUERY_IMMODULES_TEST=false \
-             RUN_QUERY_LOADER_TEST=false
+             RUN_QUERY_IMMODULES_TEST=false
 
 %find_lang gtk30
 %find_lang gtk30-properties
@@ -173,7 +163,6 @@ done
 
 (cd $RPM_BUILD_ROOT%{_bindir}
  mv gtk-query-immodules-3.0 gtk-query-immodules-3.0-%{__isa_bits}
- mv gdk-pixbuf-query-loaders-3.0 gdk-pixbuf-query-loaders-3.0-%{__isa_bits}
 )
 
 # Input method frameworks want this
@@ -185,14 +174,12 @@ rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/*/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/*/*.la
 
 touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
-touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/loaders.cache
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/immodules
 
 %post
 /sbin/ldconfig
-gdk-pixbuf-query-loaders-3.0-%{__isa_bits} --update-cache
 gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 
 %post immodules
@@ -204,7 +191,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %postun
 /sbin/ldconfig
 if [ $1 -gt 0 ]; then
-  gdk-pixbuf-query-loaders-3.0-%{__isa_bits} --update-cache
   gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 fi
 
@@ -217,7 +203,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %files -f gtk30.lang
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING NEWS README
-%{_bindir}/gdk-pixbuf-query-loaders-3.0*
 %{_bindir}/gtk-query-immodules-3.0*
 %{_bindir}/gtk-update-icon-cache-3.0
 %{_libdir}/libgtk-x11-3.0.so.*
@@ -229,7 +214,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %dir %{_libdir}/gtk-3.0/%{bin_version}
 %{_libdir}/gtk-3.0/%{bin_version}/engines
 %dir %{_libdir}/gtk-3.0/%{bin_version}/immodules
-%{_libdir}/gtk-3.0/%{bin_version}/loaders
 %{_libdir}/gtk-3.0/%{bin_version}/printbackends
 %{_libdir}/gtk-3.0/modules
 %{_libdir}/gtk-3.0/immodules
@@ -238,9 +222,7 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %{_datadir}/themes/Raleigh
 %{_libdir}/girepository-1.0
 %dir %{_sysconfdir}/gtk-3.0
-%ghost %{_libdir}/gtk-3.0/%{bin_version}/loaders.cache
 %ghost %{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
-%{_mandir}/man1/gdk-pixbuf-query-loaders-3.0.1.gz
 %{_mandir}/man1/gtk-query-immodules-3.0.1.gz
 %{_mandir}/man1/gtk-update-icon-cache-3.0.1.gz
 
@@ -269,7 +251,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %{_libdir}/gtk-3.0/include
 %{_includedir}/*
 %{_datadir}/aclocal/*
-%{_bindir}/gdk-pixbuf-csource-3.0
 %{_bindir}/gtk-builder-convert-3.0
 %{_libdir}/pkgconfig/*
 %{_bindir}/gtk3-demo
@@ -286,6 +267,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %doc tmpdocs/examples
 
 %changelog
+* Mon Jun 28 2010 Matthias Clasen <mclasen@redhat.com> 2.90.4-1
+- Update to 2.90.4
+
 * Fri Jun 18 2010 Matthias Clasen <mclasen@redhat.com> 2.90.3-1
 - Update to 2.90.3
 
diff --git a/sources b/sources
index 36fedd6..fb5a281 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e860c3b069289acca6cefb9d21aa0c50  gtk+-2.90.3.tar.bz2
+c70b0c0617b02de3d1ff24a8b1fad5e6  gtk+-2.90.4.tar.bz2