From dfe1bfb38e08518806986fde9a036a5f7e443225 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Nov 26 2015 22:15:43 +0000
Subject: revert obsolete, as %python_provide does it (undocumented)


kparal pointed out python2-libsolv was already obsoleting
python-libsolv, even though this wasn't written in the spec.
This puzzled us, but I found out today that the python_provide
macro actually also produces an Obsoletes: line, but this is
not documented anywhere besides the trac ticket:
https://fedorahosted.org/fpc/ticket/565
so we actually didn't need to add the Obsoletes: directly.
This reverts to the spec as of -3.

---

diff --git a/libsolv.spec b/libsolv.spec
index 1f5d629..1233775 100644
--- a/libsolv.spec
+++ b/libsolv.spec
@@ -30,7 +30,7 @@
 
 Name:		libsolv
 Version:	0.6.14
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	BSD
 Url:		https://github.com/openSUSE/libsolv
 Source:		https://github.com/openSUSE/libsolv/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -114,11 +114,6 @@ Summary:	Python bindings for the libsolv library
 Group:		Development/Languages
 Requires:	python2
 Requires:	libsolv%{?_isa} = %{version}-%{release}
-# Stupidly, after F23+ switched to 'python2-solv', the packagers kept
-# building newer releases for F22 with 'python-solv', so we can't just
-# do "Obsoletes: python-solv < 0.6.11-3" - we have to do something like
-# this. *WILL NEED ADJUSTING IF AN EPOCH IS ADDED TO <F23 BUILD*
-Obsoletes:	python-solv < %{version}-%{release}
 %{?python_provide:%python_provide python2-solv}
 
 %description -n python2-solv
@@ -241,6 +236,9 @@ make ARGS="-V" test
 %endif
 
 %changelog
+* Thu Nov 26 2015 Adam Williamson <awilliam@redhat.com> - 0.6.14-6
+- revert obsolete, as %python_provide does it (undocumented)
+
 * Wed Nov 18 2015 Adam Williamson <awilliam@redhat.com> - 0.6.14-5
 - adjust obsolete for stupid packaging