From b41026a146ab05f8b87a968fa293dde491e7d59c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Feb 15 2020 21:03:54 +0000 Subject: Fix Obsoletes for python2-cherrypy. There is no python-cherrypy, so putting Obsoletes on it does nothing. The Obsoletes need to be on the python3-cherrypy subpackage, which is what actually gets installed. And then there is no need to Obsolete python3-cherrypy, because that's the name of this subpackage. --- diff --git a/python-cherrypy.spec b/python-cherrypy.spec index 169a537..33b8152 100644 --- a/python-cherrypy.spec +++ b/python-cherrypy.spec @@ -5,7 +5,7 @@ Name: python-cherrypy %global camelname CherryPy Version: 18.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Pythonic, object-oriented web development framework License: BSD URL: http://www.cherrypy.org/ @@ -16,9 +16,6 @@ Source0: https://files.pythonhosted.org/packages/source/C/%{camelname}/%{ BuildArch: noarch -obsoletes: python2-cherrypy < 3.5.1 -obsoletes: python3-cherrypy < 18.1.2-3 - BuildRequires: dos2unix BuildRequires: python3-devel BuildRequires: python3dist(setuptools) @@ -47,6 +44,9 @@ results in smaller source code developed in less time. Summary: %summary %{?python_provide:%python_provide python3-cherrypy} +# Remove after F32. +Obsoletes: python2-cherrypy < 3.5.1 + %description -n python3-cherrypy %_description %prep @@ -81,6 +81,9 @@ LANG=C.utf-8 %{__python3} -m pytest --ignore=build %exclude %{python3_sitelib}/cherrypy/tutorial %changelog +* Sat Feb 15 2020 Elliott Sales de Andrade - 18.1.2-4 +- Fix Obsoletes for python2-cherrypy + * Thu Aug 08 2019 Dan Radez - 18.1.2-3 - Update to 18.1.2 - Replaced Python2 package with Python 3 package