This commit is contained in:
Matthias Clasen 2007-05-24 16:12:35 +00:00
parent d72c900ba4
commit 7f87771a37
3 changed files with 12 additions and 17 deletions

View File

@ -1 +1 @@
gtk+-2.10.11.tar.bz2 gtk+-2.11.0.tar.bz2

View File

@ -10,7 +10,7 @@
%define cairo_version %{cairo_base_version}-1 %define cairo_version %{cairo_base_version}-1
%define libpng_version 2:1.2.2-16 %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 %define bin_version 2.10.0
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@ -19,7 +19,7 @@ Version: %{base_version}
Release: 1%{?dist} Release: 1%{?dist}
License: LGPL License: LGPL
Group: System Environment/Libraries 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 Source1: update-gdk-pixbuf-loaders
Source2: update-gtk-immodules Source2: update-gtk-immodules
@ -27,15 +27,9 @@ Source2: update-gtk-immodules
Patch0: gtk+-2.4.1-lib64.patch Patch0: gtk+-2.4.1-lib64.patch
# Fedora patch # Fedora patch
Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.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 # use fam for recent-files
Patch3: gtk+-2.10.3-fam.patch Patch2: gtk+-2.10.3-fam.patch
# backport from HEAD Patch3: gtk+-2.10.11-user-dirs.patch
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
BuildRequires: atk-devel >= %{atk_version} BuildRequires: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version} BuildRequires: pango-devel >= %{pango_version}
@ -117,11 +111,8 @@ docs for the GTK+ widget toolkit.
%patch0 -p1 -b .lib64 %patch0 -p1 -b .lib64
%patch1 -p1 -b .set-invisible-char-to-bullet %patch1 -p1 -b .set-invisible-char-to-bullet
%patch2 -p1 -b .search %patch2 -p1 -b .fam
%patch3 -p1 -b .fam %patch3 -p1 -b .user-dirs
%patch7 -p1 -b .cursor-blink
%patch10 -p1 -b .im-reset
%patch12 -p1 -b .user-dirs
for i in config.guess config.sub ; do for i in config.guess config.sub ; do
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@ -288,6 +279,10 @@ rm -rf $RPM_BUILD_ROOT
%doc tmpdocs/examples %doc tmpdocs/examples
%changelog %changelog
* Thu May 24 2007 Matthias Clasen <mclasen@redhat.com> - 1.11.0-1
- Update to 2.11.0
- Drop upstreamed patches
* Sat May 19 2007 Matthias Clasen <mclasen@redhat.com> - 1.10.12-1 * Sat May 19 2007 Matthias Clasen <mclasen@redhat.com> - 1.10.12-1
- Update to 2.10.12 - Update to 2.10.12
- Drop upstreamed patches - Drop upstreamed patches

View File

@ -1 +1 @@
cf969c62134c662ff07e64613ed6c11f gtk+-2.10.12.tar.bz2 e6a5d829bb729b2d7c35d2988974119b gtk+-2.11.0.tar.bz2