From 88eaba7d6e2d13a3145f0a640e1dbcb4889a6792 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Aug 22 2015 20:53:25 +0000
Subject: Rename Python 2 subpackage to python-gobject for consistency


This allows us to have matching:

python-gobject
python-gobject-base

python3-gobject
python3-gobject-base

---

diff --git a/pygobject3.spec b/pygobject3.spec
index e1e68ec..59d4c64 100644
--- a/pygobject3.spec
+++ b/pygobject3.spec
@@ -22,10 +22,10 @@
 
 Name: pygobject3
 Version: 3.17.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+ and MIT
 Group: Development/Languages
-Summary: Python 2 bindings for GObject Introspection
+Summary: Python bindings for GObject Introspection
 URL: https://live.gnome.org/PyGObject
 #VCS: git:git://git.gnome.org/pygobject
 Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.17/pygobject-%{version}.tar.xz
@@ -61,28 +61,44 @@ BuildRequires: dejavu-serif-fonts
 BuildRequires: dbus-x11
 %endif # with_check
 
-Requires: %{name}-base%{?_isa} = %{version}-%{release}
+%description
+The %{name} package provides a convenient wrapper for the GObject library
+for use in Python programs.
 
+%package -n python-gobject
+Summary: Python 2 bindings for GObject Introspection
+Group: Development/Languages
+Requires: python-gobject-base%{?_isa} = %{version}-%{release}
 # The cairo override module depends on this
 Requires: pycairo%{?_isa}
 
-%description
-The %{name} package provides a convenient wrapper for the GObject library
-for use in Python programs.
+Obsoletes: %{name} < 3.17.90-2
+Provides: %{name} = %{version}-%{release}
+Provides: %{name}%{?_isa} = %{version}-%{release}
 
-%package base
+%description -n python-gobject
+The python-gobject package provides a convenient wrapper for the GObject
+library and and other libraries that are compatible with GObject Introspection,
+for use in Python 2 programs.
+
+%package -n python-gobject-base
 Summary: Python 2 bindings for GObject Introspection base package
 Group: Development/Languages
 Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version}
 
-%description base
+Obsoletes: %{name}-base < 3.17.90-2
+Provides: %{name}-base = %{version}-%{release}
+Provides: %{name}-base%{?_isa} = %{version}-%{release}
+
+%description -n python-gobject-base
 This package provides the non-cairo specific bits of the GObject Introspection
 library.
 
 %package devel
 Summary: Development files for embedding PyGObject introspection support
 Group: Development/Languages
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: python-gobject%{?_isa} = %{version}-%{release}
+Requires: python3-gobject%{?_isa} = %{version}-%{release}
 Requires: gobject-introspection-devel%{?_isa}
 
 %description devel
@@ -92,9 +108,7 @@ This package contains files required to embed PyGObject
 %package -n python3-gobject
 Summary: Python 3 bindings for GObject Introspection
 Group: Development/Languages
-
 Requires: python3-gobject-base%{?_isa} = %{version}-%{release}
-
 # The cairo override module depends on this
 Requires: python3-cairo%{?_isa}
 
@@ -189,11 +203,11 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check %{verbosity}
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -n python-gobject
 %defattr(644, root, root, 755)
 %{python_sitearch}/gi/_gi_cairo.so
 
-%files base
+%files -n python-gobject-base
 %defattr(644, root, root, 755)
 %license COPYING
 %doc AUTHORS NEWS README
@@ -228,6 +242,10 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check %{verbosity}
 %endif # with_python3
 
 %changelog
+* Sat Aug 22 2015 Kalev Lember <klember@redhat.com> - 3.17.90-2
+- Rename Python 2 subpackage to python-gobject for consistency with the
+  python3-gobject package
+
 * Thu Aug 20 2015 Kalev Lember <klember@redhat.com> - 3.17.90-1
 - Update to 3.17.90
 - Use make_install macro