Mon Jun 28 15:03:47 UTC 2010

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30291

Modified Files:
	.cvsignore gtk2.spec sources 
Removed Files:
	0001-Avoid-drawing-implicit-paints-to-destroyed-windows.patch 
	0001-Drop-duplicate-declarations.patch 
	0001-Make-level3-keys-work-again.patch allow-set-hint.patch 
	filesystemref.patch gtk+-2.13.5-lib64.patch 
	gtk2-2.19.3-install-Gdk-2.0.gir.patch gtk2-preview.patch 
	gtk2-rotate-layout.patch iconview-hang.patch 
	image-size-alloc.patch symbolic-color-parsing.patch 
	toolbutton-assert.patch 
Log Message:
2.21.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129

--- .cvsignore	10 Jun 2010 18:58:07 -0000	1.128
+++ .cvsignore	28 Jun 2010 15:03:47 -0000	1.129
@@ -1 +1 @@
-gtk+-2.21.2.tar.bz2
+gtk+-2.21.3.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -p -r1.435 -r1.436
--- gtk2.spec	25 Jun 2010 19:24:39 -0000	1.435
+++ gtk2.spec	28 Jun 2010 15:03:47 -0000	1.436
@@ -17,8 +17,8 @@
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
-Version: 2.21.2
-Release: 2%{?dist}
+Version: 2.21.3
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -45,8 +45,10 @@ Patch11: gtk2-remove-connecting-reason.p
 Patch15: window-dragging.patch
 
 BuildRequires: atk-devel >= %{atk_version}
-BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: cairo-devel
+BuildRequires: gdk-pixbuf2-devel
+BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: libtiff-devel
 BuildRequires: libjpeg-devel
 BuildRequires: jasper-devel
@@ -66,8 +68,6 @@ BuildRequires: libXcomposite-devel
 BuildRequires: libXdamage-devel
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 # Conflicts with packages containing theme engines
 # built against the 2.4.0 ABI
 Conflicts: gtk2-engines < 2.7.4-7
@@ -120,6 +120,7 @@ Requires: gtk2 = %{version}-%{release}
 Requires: pango-devel >= %{pango_version}
 Requires: atk-devel >= %{atk_version}
 Requires: glib2-devel >= %{glib2_version}
+Requires: gdk-pixbuf2-devel
 Requires: cairo-devel >= %{cairo_version}
 Requires: libX11-devel, libXcursor-devel, libXinerama-devel
 Requires: libXext-devel, libXi-devel, libXrandr-devel
@@ -166,9 +167,7 @@ This package contains developer document
 	   --enable-debug		\
 	   --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
@@ -209,8 +208,7 @@ if test "x$compile_host" != "x$host" ; t
 fi
 
 make install DESTDIR=$RPM_BUILD_ROOT        \
-             RUN_QUERY_IMMODULES_TEST=false \
-             RUN_QUERY_LOADER_TEST=false
+             RUN_QUERY_IMMODULES_TEST=false
 
 %find_lang gtk20
 %find_lang gtk20-properties
@@ -238,16 +236,13 @@ done
 case "$host" in
   alpha*|ia64*|powerpc64*|s390x*|x86_64*)
    mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-64
-   mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-64
    ;;
   *)
    mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-32
-   mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-32
    ;;
 esac
 
 # Install wrappers for the binaries
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gdk-pixbuf-loaders
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-gtk-immodules
 
 # Input method frameworks want this
@@ -261,7 +256,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{b
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host
 touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host/gtk.immodules
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host/gdk-pixbuf.loaders
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
@@ -273,14 +267,12 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2
 #
 echo %dir %{_sysconfdir}/gtk-2.0/$host >> gtk20.lang
 echo %ghost %{_sysconfdir}/gtk-2.0/$host/gtk.immodules >> gtk20.lang
-echo %ghost %{_sysconfdir}/gtk-2.0/$host/gdk-pixbuf.loaders >> gtk20.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/usr/bin/update-gdk-pixbuf-loaders %{_host}
 /usr/bin/update-gtk-immodules %{_host}
 
 %post immodules
@@ -292,7 +284,6 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 /sbin/ldconfig
 if [ $1 -gt 0 ]; then
-  /usr/bin/update-gdk-pixbuf-loaders %{_host}
   /usr/bin/update-gtk-immodules %{_host}
 fi
 
@@ -306,22 +297,17 @@ fi
 %defattr(-, root, root)
 
 %doc AUTHORS COPYING NEWS README
-%{_bindir}/gdk-pixbuf-query-loaders*
 %{_bindir}/gtk-query-immodules-2.0*
-%{_bindir}/update-gdk-pixbuf-loaders
 %{_bindir}/update-gtk-immodules
 %{_bindir}/gtk-update-icon-cache
 %{_libdir}/libgtk-x11-2.0.so.*
 %{_libdir}/libgdk-x11-2.0.so.*
-%{_libdir}/libgdk_pixbuf-2.0.so.*
-%{_libdir}/libgdk_pixbuf_xlib-2.0.so.*
 %{_libdir}/libgailutil.so.*
 %dir %{_libdir}/gtk-2.0
 %dir %{_libdir}/gtk-2.0/%{bin_version}
 %{_libdir}/gtk-2.0/%{bin_version}/engines
 %{_libdir}/gtk-2.0/%{bin_version}/filesystems
 %dir %{_libdir}/gtk-2.0/%{bin_version}/immodules
-%{_libdir}/gtk-2.0/%{bin_version}/loaders
 %{_libdir}/gtk-2.0/%{bin_version}/printbackends
 %{_libdir}/gtk-2.0/modules
 %{_libdir}/gtk-2.0/immodules
@@ -373,7 +359,10 @@ fi
 %doc tmpdocs/examples
 
 %changelog
-* Fri Jun 25 2010 Colin Walters <walters at verbum.org> - 2.21.2-1
+* Mon Jun 28 2010 Matthias Clasen <mclasen at redhat.com> - 2.21.3-1
+- Update to 2.21.3
+
+* Fri Jun 25 2010 Colin Walters <walters at verbum.org> - 2.21.2-2
 - drop gir-repository-devel dep
 
 * Thu Jun 10 2010 Matthias Clasen <mclasen at redhat.com> - 2.21.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- sources	10 Jun 2010 18:58:07 -0000	1.139
+++ sources	28 Jun 2010 15:03:47 -0000	1.140
@@ -1 +1 @@
-4c8d78dc50c0f9bf7784194e52670d6a  gtk+-2.21.2.tar.bz2
+6c2ce2dc24b4864365630eebf51368c6  gtk+-2.21.3.tar.bz2


--- 0001-Avoid-drawing-implicit-paints-to-destroyed-windows.patch DELETED ---


--- 0001-Drop-duplicate-declarations.patch DELETED ---


--- 0001-Make-level3-keys-work-again.patch DELETED ---


--- allow-set-hint.patch DELETED ---


--- filesystemref.patch DELETED ---


--- gtk+-2.13.5-lib64.patch DELETED ---


--- gtk2-2.19.3-install-Gdk-2.0.gir.patch DELETED ---


--- gtk2-preview.patch DELETED ---


--- gtk2-rotate-layout.patch DELETED ---


--- iconview-hang.patch DELETED ---


--- image-size-alloc.patch DELETED ---


--- symbolic-color-parsing.patch DELETED ---


--- toolbutton-assert.patch DELETED ---

