merge with f15 to fix EVR inversion

2011-11-16 11:53:52 -05:00 · 2011-11-16 11:53:52 -05:00 · 5625c40f83
commit 5625c40f83
parent ea6ee0bb14 cad5fe5549
1 changed files with 9 additions and 3 deletions
--- 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+
@ -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.32.0-5

 ### Dependencies ###

@ -160,8 +163,11 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/pygtk

 %changelog
-* Mon Nov 14 2011 Adam Jackson <ajax@redhat.com> - 2.24.0-2
- Rebuild to drop bogus libpng dep
+* Thu May  5 2011 Colin Walters <walters@verbum.org> - 2.24.0-3
+- Increase obsoletes version to be larger than both f14 and f15
+
+* Thu May  5 2011 Colin Walters <walters@verbum.org> - 2.24.0-2
+- Obsolete gnome-python2-applet

 * Tue Apr 12 2011 Christopher Aillon <caillon@redhat.com> - 2.24.0-1
 - Update to 2.24.0