From cc648ba7447fdb27b8c412d27b6d42049c68a71c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 5 May 2011 14:33:23 -0400 Subject: [PATCH 1/2] Obsolete gnome-python2-applet --- pygtk2.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pygtk2.spec b/pygtk2.spec index 78d9907..d152ae1 100644 --- a/pygtk2.spec +++ b/pygtk2.spec @@ -15,7 +15,7 @@ Name: pygtk2 Version: 2.24.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Languages Summary: Python bindings for GTK+ @@ -28,6 +28,9 @@ Source: http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.24/pygtk-%{version}.tar.b # RH bug #208608 Patch0: pygtk-nodisplay-exception.patch +# This was dropped from gnome-python; obsolete it here because, well, +# we have to put it somewhere +Obsoletes: gnome-python2-applet < 2.31.1-5 ### Dependencies ### @@ -160,6 +163,9 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/pygtk %changelog +* Thu May 5 2011 Colin Walters - 2.24.0-2 +- Obsolete gnome-python2-applet + * Tue Apr 12 2011 Christopher Aillon - 2.24.0-1 - Update to 2.24.0 From cad5fe55497f810ff76fa0069f1f6daa25abfd0b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 5 May 2011 18:07:51 -0400 Subject: [PATCH 2/2] Increase obsoletes version to be larger than both f14 and f15 --- pygtk2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pygtk2.spec b/pygtk2.spec index d152ae1..5871556 100644 --- a/pygtk2.spec +++ b/pygtk2.spec @@ -15,7 +15,7 @@ Name: pygtk2 Version: 2.24.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: Development/Languages Summary: Python bindings for GTK+ @@ -30,7 +30,7 @@ Patch0: pygtk-nodisplay-exception.patch # This was dropped from gnome-python; obsolete it here because, well, # we have to put it somewhere -Obsoletes: gnome-python2-applet < 2.31.1-5 +Obsoletes: gnome-python2-applet < 2.32.0-5 ### Dependencies ### @@ -163,6 +163,9 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/pygtk %changelog +* Thu May 5 2011 Colin Walters - 2.24.0-3 +- Increase obsoletes version to be larger than both f14 and f15 + * Thu May 5 2011 Colin Walters - 2.24.0-2 - Obsolete gnome-python2-applet