From 4a4cfa9a8f09b8187c12347d6de5d17db31c34a8 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Nov 15 2015 18:42:03 +0000
Subject: Explicit python2 subpackages.


---

diff --git a/fedmsg.spec b/fedmsg.spec
index 968b529..43479da 100644
--- a/fedmsg.spec
+++ b/fedmsg.spec
@@ -7,13 +7,13 @@
 #                       |
 #     +-----------------+-------------+
 #     V                               V
-# python-fedmsg-core        python3-fedmsg-core
+# python2-fedmsg-core        python3-fedmsg-core
 #     |
 #     |
 #     +----------------+-------------------------+
 #     |                |                         |
 #     |                V                         V
-#     |      python-fedmsg-consumers   python-fedmsg-commands
+#     |      python2-fedmsg-consumers   python2-fedmsg-commands
 #     |                |                         |
 #     |                |                         |
 #   fedmsg <-----------+-------------------------+
@@ -39,7 +39,7 @@
 
 Name:           fedmsg
 Version:        0.16.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tools for Fedora Infrastructure real-time messaging
 License:        LGPLv2+
 URL:            http://github.com/fedora-infra/fedmsg
@@ -104,16 +104,18 @@ BuildRequires:  systemd
 %endif
 
 # Finally, make the 'fedmsg' master package require all these components
-Requires:       python-fedmsg-core = %{version}-%{release}
-Requires:       python-fedmsg-commands = %{version}-%{release}
-Requires:       python-fedmsg-consumers = %{version}-%{release}
+Requires:       python2-fedmsg-core = %{version}-%{release}
+Requires:       python2-fedmsg-commands = %{version}-%{release}
+Requires:       python2-fedmsg-consumers = %{version}-%{release}
 
 %description
 Python API used around Fedora Infrastructure to send and receive messages with
 zeromq.  Includes some CLI tools.
 
-%package -n python-fedmsg-core
-Summary:    Core python API for fedmsg
+%package -n python2-fedmsg-core
+Summary:        Core python API for fedmsg
+
+Provides:       python-fedmsg-core
 
 Requires:       python-six
 Requires:       python-zmq
@@ -129,7 +131,7 @@ Requires:       python-ordereddict
 Requires:       python-argparse
 %endif
 
-%description -n python-fedmsg-core
+%description -n python2-fedmsg-core
 Core Python API used around Fedora Infrastructure to send and receive messages
 with zeromq.
 
@@ -150,30 +152,34 @@ Core python%{python3_pkgversion} API used around Fedora Infrastructure to send
 and receive messages with zeromq.
 %endif
 
-%package -n python-fedmsg-commands
+%package -n python2-fedmsg-commands
 Summary:        Basic fedmsg commands
 
+Provides:       python-fedmsg-commands
+
 Requires:       python-pygments
 Requires:       python-psutil
-Requires:       python-fedmsg-core = %{version}-%{release}
+Requires:       python2-fedmsg-core = %{version}-%{release}
 
 %if 0%{?rhel} && 0%{?rhel} <= 6
 Requires:       python-logutils
 %endif
 
-%description -n python-fedmsg-commands
+%description -n python2-fedmsg-commands
 Basic CLI commands for fedmsg
 
-%package -n python-fedmsg-consumers
+%package -n python2-fedmsg-consumers
 Summary:        Basic fedmsg consumers
 
+Provides:       python-fedmsg-consumers
+
 Requires:       python-moksha-hub >= 1.3.2
 Requires:       python-pygments
 Requires:       python-psutil
 Requires:       python-daemon
-Requires:       python-fedmsg-core = %{version}-%{release}
+Requires:       python2-fedmsg-core = %{version}-%{release}
 
-%description -n python-fedmsg-consumers
+%description -n python2-fedmsg-consumers
 Moksha consumer API for fedmsg
 
 %package base
@@ -386,10 +392,10 @@ fi
 %files
 %doc doc/ README.rst LICENSE
 
-%files -n python-fedmsg-core
+%files -n python2-fedmsg-core
 %doc doc/ README.rst LICENSE
 
-%dir %{python_sitelib}/%{modname}/
+%dir %{python2_sitelib}/%{modname}/
 
 %{python2_sitelib}/%{modname}/__init__.py*
 %{python2_sitelib}/%{modname}/config.py*
@@ -428,18 +434,18 @@ fi
 %{python3_sitelib}/%{modname}-%{version}-py%{python3_version}.egg-info/
 %endif
 
-%files -n python-fedmsg-commands
+%files -n python2-fedmsg-commands
 %doc doc/ README.rst LICENSE
-%{python_sitelib}/%{modname}/commands/
+%{python2_sitelib}/%{modname}/commands/
 %{_bindir}/fedmsg-logger
 %{_bindir}/fedmsg-tail
 %{_bindir}/fedmsg-trigger
 %{_bindir}/fedmsg-config
 %{_bindir}/fedmsg-dg-replay
 
-%files -n python-fedmsg-consumers
+%files -n python2-fedmsg-consumers
 %doc doc/ README.rst LICENSE
-%{python_sitelib}/%{modname}/consumers/
+%{python2_sitelib}/%{modname}/consumers/
 
 %files base
 %doc doc/ README.rst LICENSE
@@ -512,6 +518,10 @@ fi
 %endif
 
 %changelog
+* Sun Nov 15 2015 Ralph Bean <rbean@redhat.com> - 0.16.2-5
+- Rename subpackges to explicit python2 prefixes and add Provides
+  on the old names.
+
 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.16.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5