From c51ea59c05bb58a7b7826003817e8469df5a1a01 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jun 01 2017 20:35:58 +0000 Subject: Change fixed Obsoletes version with a dynamic one (rhbz#1457336) --- diff --git a/python2-docs.spec b/python2-docs.spec index cf78bc7..3fc0782 100644 --- a/python2-docs.spec +++ b/python2-docs.spec @@ -1,14 +1,9 @@ -# Macro for using the version-release where python-docs got -# renamed to python2-docs at Fedora 26, in order to ensure clean upgrade path. -# It should be removed along with the obsoletes at Fedora 28. -%define obs 2.7.13-1 - %define pybasever 2.7 Name: python2-docs # The Version needs to be in-sync with the "python2" package: Version: 2.7.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Documentation for the Python 2 programming language Group: Documentation License: Python @@ -32,7 +27,11 @@ BuildRequires: linkchecker Requires: python2 = %{version} Provides: python-docs = %{version}-%{release} -Obsoletes: python-docs < %{obs} + +# All the obsolete tags similar to this one should be removed at Fedora 28 +# Also, according to the guidelines, this should be a hardcoded version, +# but that was proven problematic, see rhbz#1457336 +Obsoletes: python-docs < %{version}-%{release} %description The python2-docs package contains documentation on the Python 2 @@ -49,7 +48,7 @@ Requires(preun):info BuildRequires: texinfo Provides: python-docs-info = %{version}-%{release} -Obsoletes: python-docs-info < %{obs} +Obsoletes: python-docs-info < %{version}-%{release} %description info The python2-docs-info package contains documentation on the Python 2 @@ -115,6 +114,9 @@ linkchecker \ %license LICENSE %changelog +* Thu Jun 01 2017 Miro Hrončok - 2.7.13-3 +- Change fixed Obsoletes version with a dynamic one (rhbz#1457336) + * Sat Feb 11 2017 Fedora Release Engineering - 2.7.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild