diff --git a/.cvsignore b/.cvsignore index 1b757a2..5a93dba 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gtk+-2.10.11.tar.bz2 +gtk+-2.11.0.tar.bz2 diff --git a/gtk2.spec b/gtk2.spec index 406b958..830c0eb 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -10,7 +10,7 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.10.12 +%define base_version 2.11.0 %define bin_version 2.10.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X @@ -19,7 +19,7 @@ Version: %{base_version} Release: 1%{?dist} License: LGPL Group: System Environment/Libraries -Source: http://download.gnome.org/sources/gtk+/2.10/gtk+-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2 Source1: update-gdk-pixbuf-loaders Source2: update-gtk-immodules @@ -27,15 +27,9 @@ Source2: update-gtk-immodules Patch0: gtk+-2.4.1-lib64.patch # Fedora patch Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch -# Filechooser search -Patch2: gtk+-2.10.12-search.patch # use fam for recent-files -Patch3: gtk+-2.10.3-fam.patch -# backport from HEAD -Patch7: gtk+-2.10.7-cursor-blink.patch -# fixed in upstream cvs -Patch10: gtk+-2.10.4-im-reset.patch -Patch12: gtk+-2.10.11-user-dirs.patch +Patch2: gtk+-2.10.3-fam.patch +Patch3: gtk+-2.10.11-user-dirs.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} @@ -117,11 +111,8 @@ docs for the GTK+ widget toolkit. %patch0 -p1 -b .lib64 %patch1 -p1 -b .set-invisible-char-to-bullet -%patch2 -p1 -b .search -%patch3 -p1 -b .fam -%patch7 -p1 -b .cursor-blink -%patch10 -p1 -b .im-reset -%patch12 -p1 -b .user-dirs +%patch2 -p1 -b .fam +%patch3 -p1 -b .user-dirs for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -288,6 +279,10 @@ rm -rf $RPM_BUILD_ROOT %doc tmpdocs/examples %changelog +* Thu May 24 2007 Matthias Clasen - 1.11.0-1 +- Update to 2.11.0 +- Drop upstreamed patches + * Sat May 19 2007 Matthias Clasen - 1.10.12-1 - Update to 2.10.12 - Drop upstreamed patches diff --git a/sources b/sources index 13e18d6..2d0da5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf969c62134c662ff07e64613ed6c11f gtk+-2.10.12.tar.bz2 +e6a5d829bb729b2d7c35d2988974119b gtk+-2.11.0.tar.bz2