From fb0f7e6364e6e6d48242a05a15679a1c64d3adbe Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rmcgover@redhat.com>
Date: Oct 17 2017 06:21:51 +0000
Subject: Use appropriate Provides, Obsoletes


Enables upgrade from versions of kobo prior to 0.7.0.
Allows packages depending on "kobo-*" to continue working (e.g. pungi,
compose-utils).

---

diff --git a/kobo.spec b/kobo.spec
index 961edb2..4709553 100644
--- a/kobo.spec
+++ b/kobo.spec
@@ -62,7 +62,9 @@ Kobo is a set of python modules designed for rapid tools development.
 
 %package -n python2-%{name}
 Summary:        Python modules for tools development
-# TODO Provides and obsoletes kobo
+%{?python_provide:%python_provide python2-%{name}}
+Provides:       kobo
+Obsoletes:      kobo
 
 %description -n python2-%{name}
 Kobo is a set of python modules designed for rapid tools development.
@@ -74,6 +76,9 @@ Summary:        Django components
 Group:          Development/Libraries
 Requires:       python2-kobo = %{version}-%{release}
 Requires:       python-django >= 1.6
+%{?python_provide:%python_provide python2-%{name}-django}
+Provides:       kobo-django
+Obsoletes:      kobo-django
 
 %description -n python2-%{name}-django
 Django components.
@@ -88,6 +93,9 @@ Requires:       python2-kobo = %{version}-%{release}
 %if "%{python2_version}" == "2.4"
 Requires:       python-simplejson
 %endif
+%{?python_provide:%python_provide python2-%{name}-client}
+Provides:       kobo-client
+Obsoletes:      kobo-client
 
 %description -n python2-%{name}-client
 CLI client.
@@ -99,6 +107,9 @@ CLI client.
 Summary:        Worker daemon processing tasks submitted to the hub
 Group:          Development/Libraries
 Requires:       python2-kobo = %{version}-%{release}
+%{?python_provide:%python_provide python2-%{name}-worker}
+Provides:       kobo-worker
+Obsoletes:      kobo-worker
 
 %description -n python2-%{name}-worker
 Worker daemon processing tasks submitted to the hub.
@@ -112,6 +123,9 @@ Group:          Development/Libraries
 Requires:       python2-kobo = %{version}-%{release}
 Requires:       python2-django >= 1.6
 Requires:       gzip
+%{?python_provide:%python_provide python2-%{name}-hub}
+Provides:       kobo-hub
+Obsoletes:      kobo-hub
 
 %description -n python2-%{name}-hub
 Hub is a xml-rpc and web interface to a task database.
@@ -124,6 +138,9 @@ Group:          Development/Libraries
 Requires:       python2-kobo = %{version}-%{release}
 Requires:       rpm-python
 Requires:       python2-koji
+%{?python_provide:%python_provide python2-%{name}-rpmlib}
+Provides:       kobo-rpmlib
+Obsoletes:      kobo-rpmlib
 
 %description -n python2-%{name}-rpmlib
 Rpmlib contains functions to manipulate with RPM files.
@@ -135,6 +152,9 @@ Summary:        Kobo admin script for instant project deployment
 Group:          Development/Tools
 Requires:       python2-kobo >= %{version}
 Requires:       python2-django >= 1.6
+%{?python_provide:%python_provide python2-%{name}-admin}
+Provides:       kobo-admin
+Obsoletes:      kobo-admin
 
 %description -n python2-%{name}-admin
 Kobo admin provides templates for various kobo-based projects,
@@ -144,6 +164,7 @@ incl. CLI, hub client, worker and hub.
 %if 0%{?with_python3}
 %package -n python%{python3_pkgversion}-%{name}
 Summary:        Python modules for tools development
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
 
 %description -n python%{python3_pkgversion}-%{name}
 Kobo is a set of python modules designed for rapid tools development.
@@ -155,6 +176,7 @@ Summary:        Django components
 Group:          Development/Libraries
 Requires:       python%{python3_pkgversion}-kobo = %{version}-%{release}
 Requires:       python%{python3_pkgversion}-django >= 1.6
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}-django}
 
 %description -n python%{python3_pkgversion}-%{name}-django
 Django components.
@@ -166,6 +188,7 @@ Django components.
 Summary:        CLI client
 Group:          Development/Libraries
 Requires:       python%{python3_pkgversion}-kobo = %{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}-client}
 
 %description -n python%{python3_pkgversion}-%{name}-client
 CLI client.
@@ -177,6 +200,7 @@ CLI client.
 Summary:        Worker daemon processing tasks submitted to the hub
 Group:          Development/Libraries
 Requires:       python%{python3_pkgversion}-kobo = %{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}-worker}
 
 %description -n python%{python3_pkgversion}-%{name}-worker
 Worker daemon processing tasks submitted to the hub.
@@ -190,6 +214,7 @@ Group:          Development/Libraries
 Requires:       python%{python3_pkgversion}-kobo = %{version}-%{release}
 Requires:       python%{python3_pkgversion}-django >= 1.6
 Requires:       gzip
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}-hub}
 
 %description -n python%{python3_pkgversion}-%{name}-hub
 Hub is a xml-rpc and web interface to a task database.
@@ -202,6 +227,7 @@ Group:          Development/Libraries
 Requires:       python%{python3_pkgversion}-kobo = %{version}-%{release}
 Requires:       rpm-python
 Requires:       python%{python3_pkgversion}-koji
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}-rpmlib}
 
 %description -n python%{python3_pkgversion}-%{name}-rpmlib
 Rpmlib contains functions to manipulate with RPM files.
@@ -213,6 +239,7 @@ Summary:        Kobo admin script for instant project deployment
 Group:          Development/Tools
 Requires:       python%{python3_pkgversion}-kobo >= %{version}
 Requires:       python%{python3_pkgversion}-django >= 1.6
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}-admin}
 
 %description -n python%{python3_pkgversion}-%{name}-admin
 Kobo admin provides templates for various kobo-based projects,