From c8df49d2d0177479bf921c5ba8725d6aa64fe09c Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Thu, 13 Feb 2020 23:41:58 +0100 Subject: [PATCH 1/3] remove obsoletes python2-html2text from f30 --- python-html2text.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index 98fa2f7..bbe9658 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -7,7 +7,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2019.9.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_sum} License: GPLv3 @@ -28,7 +28,7 @@ BuildRequires: python3-pytest %package -n python3-%{upname} Summary: %{common_sum} Provides: %{upname} = %{version}-%{release} -Obsoletes: python2-%{upname} <= %{version}-%{release} +Obsoletes: python2-%{upname} < 2019.8.11 %{?python_provide:%python_provide python3-%{upname}} %description -n python3-%{upname} @@ -79,6 +79,9 @@ popd %changelog +* Thu Feb 13 2020 David Kaufmann - 2019.9.26-3 +- allow keeping python2-html2text in f30 + * Tue Oct 29 2019 Sérgio Basto - 2019.9.26-2 - Python3 only this version remove support for Python <= 3.4 From 180706d7074baf28176affb7ab5f3c3da11ec1e1 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 14 Feb 2020 11:06:41 +0100 Subject: [PATCH 2/3] remove the obsoletes entry completely --- python-html2text.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index bbe9658..71b1e5b 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -7,7 +7,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2019.9.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_sum} License: GPLv3 @@ -28,7 +28,6 @@ BuildRequires: python3-pytest %package -n python3-%{upname} Summary: %{common_sum} Provides: %{upname} = %{version}-%{release} -Obsoletes: python2-%{upname} < 2019.8.11 %{?python_provide:%python_provide python3-%{upname}} %description -n python3-%{upname} @@ -79,6 +78,9 @@ popd %changelog +* Thu Feb 14 2020 David Kaufmann - 2019.9.26-4 +- remove obsoletes of python2-html2text due to version mismatch + * Thu Feb 13 2020 David Kaufmann - 2019.9.26-3 - allow keeping python2-html2text in f30 From 81555f229fffb15c7cf4b689c50aaa1db9063f2e Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 14 Feb 2020 11:18:09 +0100 Subject: [PATCH 3/3] fix date in changelog --- python-html2text.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index 71b1e5b..97d99d8 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -7,7 +7,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2019.9.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_sum} License: GPLv3 @@ -78,7 +78,10 @@ popd %changelog -* Thu Feb 14 2020 David Kaufmann - 2019.9.26-4 +* Fri Feb 14 2020 David Kaufmann - 2019.9.26-5 +- changelog date fix + +* Fri Feb 14 2020 David Kaufmann - 2019.9.26-4 - remove obsoletes of python2-html2text due to version mismatch * Thu Feb 13 2020 David Kaufmann - 2019.9.26-3