[gnome-python2] Drop unused/ancient -capplet subpackage definition remains. Add %?_isa to all explicit dependencies

[Michael Schwendt]

commit 78407dbfecb6ee5160404bd8c2c0e864d7a0e1a8
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed Nov 30 18:20:33 2011 +0100

    Drop unused/ancient -capplet subpackage definition remains.
    Add %?_isa to all explicit dependencies on package names.
    Make pygtk2 dependency arch-specific (#749835).

 gnome-python2.spec |   60 ++++++++++++++++++++++++++--------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/gnome-python2.spec b/gnome-python2.spec
index dd1c48e..bde7235 100644
--- a/gnome-python2.spec
+++ b/gnome-python2.spec
@@ -42,6 +42,7 @@ BuildRequires: pygtk2-devel >= %{pygtk_version}
 BuildRequires: pyorbit-devel >= %{pyorbit_version}
 BuildRequires: python2-devel >= %{python_version}
 
+# added 2005-02-07, pkg last available in Fedora 3 and RHEL 4
 Obsoletes: gnome-python2-nautilus <= 2.6.0
 
 %description
@@ -55,33 +56,26 @@ configuration interface, and metadata support.
 %package gnome
 Summary: Python bindings for libgnome
 Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-gnomevfs = %{version}-%{release}
-Requires: libgnome >= %{libgnome_version}
-Requires: libgnomeui >= %{libgnomeui_version}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-gnomevfs%{?_isa} = %{version}-%{release}
+# explicit just for the minimum version
+Requires: libgnome%{?_isa} >= %{libgnome_version}
+Requires: libgnomeui%{?_isa} >= %{libgnomeui_version}
 # gnome.ui imports bonobo.ui (bz #689836)
-Requires: %{name}-bonobo
+Requires: %{name}-bonobo%{?_isa} = %{version}-%{release}
 
 %description gnome
 This module contains a wrapper that makes libgnome functionality available
 from Python.
 
-%package capplet
-Summary: Python bindings for GNOME Panel applets
-Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-
-%description capplet
-This module contains a wrapper that allows GNOME Control Center
-capplets to be in Python.
 
 %package canvas
 Summary: Python bindings for the GNOME Canvas
 Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-Requires: gtk2 >= %{gtk_version}
-Requires: libgnomecanvas >= %{libgnomecanvas_version}
-Requires: pygtk2 >= %{pygtk_version}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+# explicit just for the minimum version
+Requires: gtk2%{?_isa} >= %{gtk_version}
+Requires: libgnomecanvas%{?_isa} >= %{libgnomecanvas_version}
 
 %description canvas
 This module contains a wrapper that allows use of the GNOME Canvas
@@ -90,13 +84,15 @@ in Python.
 %package bonobo
 Summary: Python bindings for interacting with Bonobo
 Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+# explicit just for the minimum version
+Requires: libbonobo%{?_isa} >= %{libbonobo_version}
+Requires: libbonoboui%{?_isa} >= %{libbonoboui_version}
+Requires: pyorbit%{?_isa} >= %{pyorbit_version}
+# this is provided by libbonobo
 Requires: bonobo-activation >= %{bonobo_activation_version}
-Requires: libbonobo >= %{libbonobo_version}
-Requires: libbonoboui >= %{libbonoboui_version}
-Requires: pyorbit >= %{pyorbit_version}
 # bonobo.ui imports gnomecanvas (bz #689836)
-Requires: %{name}-canvas
+Requires: %{name}-canvas%{?_isa} = %{version}-%{release}
 
 %description bonobo
 This module contains a wrapper that allows the creation of bonobo
@@ -105,8 +101,9 @@ components and the embedding of bonobo components in Python.
 %package gconf
 Summary: Python bindings for interacting with GConf
 Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-Requires: GConf2 >= %{gconf_version}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+# explicit just for the minimum version
+Requires: GConf2%{?_isa} >= %{gconf_version}
 
 %description gconf
 This module contains a wrapper that allows the use of GConf via Python.
@@ -114,9 +111,10 @@ This module contains a wrapper that allows the use of GConf via Python.
 %package gnomevfs
 Summary: Python bindings for interacting with gnome-vfs
 Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-Requires: gnome-vfs2 >= %{libgnomevfs_version}
-Requires: libbonobo >= %{libbonobo_version}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+# explicit just for the minimum version
+Requires: gnome-vfs2%{?_isa} >= %{libgnomevfs_version}
+Requires: libbonobo%{?_isa} >= %{libbonobo_version}
 
 %description gnomevfs
 This module contains a wrapper that allows the use of gnome-vfs via python.
@@ -124,10 +122,10 @@ This module contains a wrapper that allows the use of gnome-vfs via python.
 %package devel
 Summary: Development files for building add-on libraries
 Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-Requires: gnome-vfs2-devel >= %{libgnomevfs_version}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: gnome-vfs2-devel%{?_isa} >= %{libgnomevfs_version}
+Requires: python-devel%{?_isa} >= %{python_version}
 Requires: pkgconfig
-Requires: python-devel >= %{python_version}
 
 %description devel
 This package contains files required to build wrappers for GNOME add-on
@@ -209,6 +207,8 @@ rm -f %{python_sitearch}/bonobo/__init__.{pyc,pyo}
 
 %changelog
 * Tue Nov 29 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.28.1-7
+- Drop unused/ancient -capplet subpackage definition remains.
+- Add %%?_isa to all explicit dependencies on package names.
 - Make pygtk2 dependency arch-specific (#749835).
 
 * Fri Nov 25 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.28.1-6