From d97411dd66548d8781139ed780d94e87849ff1bb Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Mon, 26 Mar 2007 07:46:27 +0000 Subject: [PATCH 01/95] initial import; review in #233743 --- .cvsignore | 1 + python-html2text.spec | 55 +++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 57 insertions(+) create mode 100644 python-html2text.spec diff --git a/.cvsignore b/.cvsignore index e69de29..dc39661 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +html2text-2.26.py diff --git a/python-html2text.spec b/python-html2text.spec new file mode 100644 index 0000000..199fadf --- /dev/null +++ b/python-html2text.spec @@ -0,0 +1,55 @@ +# sitelib for noarch packages, sitearch for others (remove the unneeded one) +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + + +Name: python-html2text +Version: 2.26 +Release: 2%{?dist} +Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text + +Group: Development/Languages +License: GPL +URL: http://www.aaronsw.com/2002/html2text/ +Source0: http://www.aaronsw.com/2002/html2text/html2text-2.26.py +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +%description +html2text is a Python script that convers a page of HTML into clean, +easy-to-read plain ASCII text. Better yet, that ASCII also happens to +be valid Markdown (a text-to-HTML format). + +Also known as: THE ASCIINATOR, html to text, htm to txt, htm2txt, ... + +%prep +%setup -q -c -T +install -p %{SOURCE0} ./html2text.py +sed -i -e 's/\r//' html2text.py + + +%build +echo Nothing to build + + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/%{python_sitelib}/ +install -p -m 0644 html2text.py $RPM_BUILD_ROOT/%{python_sitelib}/ + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%{python_sitelib}/* + + +%changelog +* Sat Mar 24 2007 Thorsten Leemhuis - 2.26-2 +- Use sed instead of dos2unix + +* Sat Mar 24 2007 Thorsten Leemhuis - 2.26-1 +- Initial package diff --git a/sources b/sources index e69de29..4c8c5e0 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +6b567fea434b188e3ce838fffccf1565 html2text-2.26.py From 6d51e65ff8622bd2426a18fbb72672d6c6c30369 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Fri, 3 Aug 2007 17:00:46 +0000 Subject: [PATCH 02/95] - Update License field due to the "Licensing guidelines changes" --- python-html2text.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index 199fadf..6e9fcdc 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -4,11 +4,11 @@ Name: python-html2text Version: 2.26 -Release: 2%{?dist} +Release: 2.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages -License: GPL +License: GPLv2 URL: http://www.aaronsw.com/2002/html2text/ Source0: http://www.aaronsw.com/2002/html2text/html2text-2.26.py BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 03 2007 Thorsten Leemhuis +- Update License field due to the "Licensing guidelines changes" + * Sat Mar 24 2007 Thorsten Leemhuis - 2.26-2 - Use sed instead of dos2unix From 0569ce51ed3b6467c80ee03b25d668c0c6ddc349 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Thu, 4 Oct 2007 04:56:10 +0000 Subject: [PATCH 03/95] 2.26-3 - BR python (fixes #317211) --- python-html2text.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 6e9fcdc..a55d822 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -4,7 +4,7 @@ Name: python-html2text Version: 2.26 -Release: 2.1 +Release: 3.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -15,6 +15,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequire: python + %description html2text is a Python script that convers a page of HTML into clean, easy-to-read plain ASCII text. Better yet, that ASCII also happens to @@ -48,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 04 2007 Thorsten Leemhuis - 2.26-3 +- BR python (fixes #317211) + * Fri Aug 03 2007 Thorsten Leemhuis - Update License field due to the "Licensing guidelines changes" From 262bdc14eac0099b907bf460891a25af23daaeab Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Thu, 4 Oct 2007 04:59:00 +0000 Subject: [PATCH 04/95] fix typo --- python-html2text.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index a55d822..cec1f6a 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequire: python +BuildRequires: python %description html2text is a Python script that convers a page of HTML into clean, From 3e7bc97a3ecdd6e752ef02b94cd28259e57af501 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Thu, 4 Oct 2007 16:57:30 +0000 Subject: [PATCH 05/95] - update to 2.28 (just one line actually different) --- .cvsignore | 2 +- python-html2text.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index dc39661..66cdd04 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -html2text-2.26.py +html2text-2.28.py diff --git a/python-html2text.spec b/python-html2text.spec index cec1f6a..a5d6945 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -1,10 +1,9 @@ # sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - Name: python-html2text -Version: 2.26 -Release: 3.1 +Version: 2.28 +Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -15,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python +BuildRequires: python %description html2text is a Python script that convers a page of HTML into clean, @@ -50,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 04 2007 Thorsten Leemhuis - 2.28-1 +- update to 2.28 (just one line actually different) + * Thu Oct 04 2007 Thorsten Leemhuis - 2.26-3 - BR python (fixes #317211) diff --git a/sources b/sources index 4c8c5e0..650c194 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b567fea434b188e3ce838fffccf1565 html2text-2.26.py +55f5e1a8301d71e043d44b3f26b7cd71 html2text-2.28.py From 225549a17331ccbf3cf866ee627c23139baff4a3 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Thu, 4 Oct 2007 17:00:32 +0000 Subject: [PATCH 06/95] missed the important part ;-) --- python-html2text.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index a5d6945..b49280c 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -9,7 +9,7 @@ Summary: Converts a page of HTML into clean, easy-to-read plain ASCII tex Group: Development/Languages License: GPLv2 URL: http://www.aaronsw.com/2002/html2text/ -Source0: http://www.aaronsw.com/2002/html2text/html2text-2.26.py +Source0: http://www.aaronsw.com/2002/html2text/html2text-%{version}.py BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From c0623b27573113ba5a7e149cfb7d0517a78f993b Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Fri, 2 Nov 2007 16:01:54 +0000 Subject: [PATCH 07/95] clog --- .cvsignore | 2 +- python-html2text.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 66cdd04..1de12bf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -html2text-2.28.py +html2text-2.29.py diff --git a/python-html2text.spec b/python-html2text.spec index b49280c..e35126d 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -2,7 +2,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-html2text -Version: 2.28 +Version: 2.29 Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Nov 02 2007 Thorsten Leemhuis - 2.29-1 +- update to 2.29 + * Thu Oct 04 2007 Thorsten Leemhuis - 2.28-1 - update to 2.28 (just one line actually different) diff --git a/sources b/sources index 650c194..ff73299 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55f5e1a8301d71e043d44b3f26b7cd71 html2text-2.28.py +22a26e2fba43a6fdd07487157f8e6677 html2text-2.29.py From d3b847028005618bfd488d5234089f031d1db323 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Fri, 4 Jul 2008 18:20:02 +0000 Subject: [PATCH 08/95] update to 2.30 (GPLv3 now -- no deps in Fedora besides rss2email, which swichted to the GPLv3 as well) --- .cvsignore | 2 +- python-html2text.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1de12bf..e888e04 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -html2text-2.29.py +html2text-2.3.py diff --git a/python-html2text.spec b/python-html2text.spec index e35126d..809cad9 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -2,12 +2,12 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-html2text -Version: 2.29 +Version: 2.3 Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages -License: GPLv2 +License: GPLv3 URL: http://www.aaronsw.com/2002/html2text/ Source0: http://www.aaronsw.com/2002/html2text/html2text-%{version}.py BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 04 2008 Thorsten Leemhuis - 2.30-1 +- update to 2.30 (GPLv3 now) + * Fri Nov 02 2007 Thorsten Leemhuis - 2.29-1 - update to 2.29 diff --git a/sources b/sources index ff73299..43efce5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22a26e2fba43a6fdd07487157f8e6677 html2text-2.29.py +95e5d245f7b336713c114ea69db2eb5f html2text-2.3.py From e90cbceb37d09d934f5c663a69fe42aaeb3cda28 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Fri, 4 Jul 2008 18:30:31 +0000 Subject: [PATCH 09/95] fix version (upstream versioning is a bit strange; let's to it how it's supposed to be in Fedora, even if it's not 100% correct) --- python-html2text.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index 809cad9..53cde26 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -2,14 +2,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-html2text -Version: 2.3 +Version: 2.30 Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages License: GPLv3 URL: http://www.aaronsw.com/2002/html2text/ -Source0: http://www.aaronsw.com/2002/html2text/html2text-%{version}.py +Source0: http://www.aaronsw.com/2002/html2text/html2text-2.3.py BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From e68061c9602e5314565231dc0c421952fd0c3612 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Sun, 27 Jul 2008 12:01:37 +0000 Subject: [PATCH 10/95] - update to 2.31 (GPLv3 now) --- .cvsignore | 2 +- python-html2text.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index e888e04..4fba042 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -html2text-2.3.py +html2text-2.31.py diff --git a/python-html2text.spec b/python-html2text.spec index 53cde26..202a49b 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -2,14 +2,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-html2text -Version: 2.30 +Version: 2.31 Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages License: GPLv3 URL: http://www.aaronsw.com/2002/html2text/ -Source0: http://www.aaronsw.com/2002/html2text/html2text-2.3.py +Source0: http://www.aaronsw.com/2002/html2text/html2text-2.31.py BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 27 2008 Thorsten Leemhuis - 2.31-1 +- update to 2.31 (GPLv3 now) + * Fri Jul 04 2008 Thorsten Leemhuis - 2.30-1 - update to 2.30 (GPLv3 now) diff --git a/sources b/sources index 43efce5..eb98f83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95e5d245f7b336713c114ea69db2eb5f html2text-2.3.py +ed191980d0a58e884677c008973a9537 html2text-2.31.py From f154339d261f403c67b94b8b1e0ee881e2bdd66f Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Fri, 1 Aug 2008 16:42:55 +0000 Subject: [PATCH 11/95] clog --- .cvsignore | 2 +- python-html2text.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4fba042..58f291a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -html2text-2.31.py +html2text-2.32.py diff --git a/python-html2text.spec b/python-html2text.spec index 202a49b..bfd94d3 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -2,14 +2,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-html2text -Version: 2.31 +Version: 2.32 Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages License: GPLv3 URL: http://www.aaronsw.com/2002/html2text/ -Source0: http://www.aaronsw.com/2002/html2text/html2text-2.31.py +Source0: http://www.aaronsw.com/2002/html2text/html2text-2.32.py BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -49,8 +49,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 01 2008 Thorsten Leemhuis - 2.32-1 +- update to 2.32 + * Sun Jul 27 2008 Thorsten Leemhuis - 2.31-1 -- update to 2.31 (GPLv3 now) +- update to 2.31 * Fri Jul 04 2008 Thorsten Leemhuis - 2.30-1 - update to 2.30 (GPLv3 now) diff --git a/sources b/sources index eb98f83..a1ce6ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed191980d0a58e884677c008973a9537 html2text-2.31.py +842c9173554c033816e0b0da306c2aae html2text-2.32.py From d8f3df5fc7b243d1421998e1be25ebdc2ea71b14 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Sat, 27 Sep 2008 07:38:16 +0000 Subject: [PATCH 12/95] - update to 2.33 --- .cvsignore | 2 +- python-html2text.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 58f291a..d1d2b36 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -html2text-2.32.py +html2text-2.33.py diff --git a/python-html2text.spec b/python-html2text.spec index bfd94d3..f3db827 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -2,14 +2,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-html2text -Version: 2.32 +Version: 2.33 Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages License: GPLv3 URL: http://www.aaronsw.com/2002/html2text/ -Source0: http://www.aaronsw.com/2002/html2text/html2text-2.32.py +Source0: http://www.aaronsw.com/2002/html2text/html2text-%{version}.py BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Sep 27 2008 Thorsten Leemhuis - 2.33-1 +- update to 2.33 + * Fri Aug 01 2008 Thorsten Leemhuis - 2.32-1 - update to 2.32 diff --git a/sources b/sources index a1ce6ce..c75929a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -842c9173554c033816e0b0da306c2aae html2text-2.32.py +5892f98437ae9516261bb0221fb152bc html2text-2.33.py From 4061abe176ebaf0b15ef078ff9130561b57c2047 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Sat, 11 Oct 2008 14:46:26 +0000 Subject: [PATCH 13/95] - update to 2.34 --- .cvsignore | 2 +- python-html2text.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index d1d2b36..619b60c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -html2text-2.33.py +html2text-2.34.py diff --git a/python-html2text.spec b/python-html2text.spec index f3db827..95aea95 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -2,7 +2,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-html2text -Version: 2.33 +Version: 2.34 Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 09 2008 Thorsten Leemhuis - 2.34-1 +- update to 2.34 + * Sat Sep 27 2008 Thorsten Leemhuis - 2.33-1 - update to 2.33 diff --git a/sources b/sources index c75929a..90151bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5892f98437ae9516261bb0221fb152bc html2text-2.33.py +39490a5e8650cf9b4582bf503be40f80 html2text-2.34.py From d05dee55a64751dae17e2c790ececa8b52815bab Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Sat, 29 Nov 2008 15:36:01 +0000 Subject: [PATCH 14/95] Rebuild for Python 2.6 --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 95aea95..5db8aae 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -3,7 +3,7 @@ Name: python-html2text Version: 2.34 -Release: 1.1 +Release: 2.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.34-2.1 +- Rebuild for Python 2.6 + * Sat Oct 09 2008 Thorsten Leemhuis - 2.34-1 - update to 2.34 From c38cc70ee75f52474aa776e32a63180c8c9c9327 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Sat, 13 Dec 2008 19:22:49 +0000 Subject: [PATCH 15/95] - update to 2.35 --- .cvsignore | 2 +- python-html2text.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 619b60c..e714550 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -html2text-2.34.py +html2text-2.35.py diff --git a/python-html2text.spec b/python-html2text.spec index 5db8aae..23d2e8c 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -2,8 +2,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-html2text -Version: 2.34 -Release: 2.1 +Version: 2.35 +Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Dec 13 2008 Thorsten Leemhuis - 2.35-1 +- update to 2.35 + * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.34-2.1 - Rebuild for Python 2.6 diff --git a/sources b/sources index 90151bb..508584e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -39490a5e8650cf9b4582bf503be40f80 html2text-2.34.py +e26ce1a77e07393bc3a9bbbf47a4f6a2 html2text-2.35.py From cebaa19889bf9dcf78ca2ce09099af02626b17ce Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 21:40:34 +0000 Subject: [PATCH 16/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 23d2e8c..9aea845 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -3,7 +3,7 @@ Name: python-html2text Version: 2.35 -Release: 1.1 +Release: 2.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 2.35-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Dec 13 2008 Thorsten Leemhuis - 2.35-1 - update to 2.35 From dc3a6eda9775c7cdf9a9792fecd5c84ef23e5ae0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 26 Jul 2009 20:26:42 +0000 Subject: [PATCH 17/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 9aea845..9fc5f16 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -3,7 +3,7 @@ Name: python-html2text Version: 2.35 -Release: 2.1 +Release: 3.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 2.35-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 2.35-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From d81de6eaf3714b473eb68c6955fbf3baf89d4d3c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:31:55 +0000 Subject: [PATCH 18/95] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ada8cae..4eddbae 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := python-html2text SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 14074887a3f52236d4ab97f729f2a9f7bb19f482 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Sun, 4 Jul 2010 16:17:07 +0000 Subject: [PATCH 19/95] - update to 2.38 --- .cvsignore | 2 +- python-html2text.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index e714550..dabcc92 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -html2text-2.35.py +html2text-2.38.py diff --git a/python-html2text.spec b/python-html2text.spec index 9fc5f16..6073a3f 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -2,8 +2,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-html2text -Version: 2.35 -Release: 3.1 +Version: 2.38 +Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 04 2010 Thorsten Leemhuis - 2.38-1 +- update to 2.38 + * Sun Jul 26 2009 Fedora Release Engineering - 2.35-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 508584e..052c248 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e26ce1a77e07393bc3a9bbbf47a4f6a2 html2text-2.35.py +11ca33eabefb6a951ff7ae667f441f19 html2text-2.38.py From 9586aefc27edd7e933de4a04026c64b2fc094fa0 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 04:24:13 +0000 Subject: [PATCH 20/95] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 6073a3f..a723060 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -3,7 +3,7 @@ Name: python-html2text Version: 2.38 -Release: 1.1 +Release: 2.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 22 2010 David Malcolm - 2.38-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Sun Jul 04 2010 Thorsten Leemhuis - 2.38-1 - update to 2.38 From 467511539c830f0861d211ce744774eab9b123ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:23:20 +0000 Subject: [PATCH 21/95] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4eddbae..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: python-html2text -# $Id$ -NAME := python-html2text -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From f8fadfab76d65acfff879696528d05e26ec2d250 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 22:12:08 -0600 Subject: [PATCH 22/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index a723060..93ff7b4 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -3,7 +3,7 @@ Name: python-html2text Version: 2.38 -Release: 2.1 +Release: 3.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.38-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Jul 22 2010 David Malcolm - 2.38-2.1 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From 1ea0204634d4b27f595e5b50c800cea626e14780 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Mon, 11 Apr 2011 20:19:31 +0200 Subject: [PATCH 23/95] Update to 3.02; use setuptools; download tarball from github --- .gitignore | 1 + python-html2text.spec | 19 ++++++++++++------- sources | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index dabcc92..6530429 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ html2text-2.38.py +/python-html2text-3.02.tar.gz diff --git a/python-html2text.spec b/python-html2text.spec index 93ff7b4..8ff5a15 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -1,20 +1,23 @@ # sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%global tardirname aaronsw-html2text-d9bf7d6 + Name: python-html2text -Version: 2.38 +Version: 3.02 Release: 3.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages License: GPLv3 URL: http://www.aaronsw.com/2002/html2text/ -Source0: http://www.aaronsw.com/2002/html2text/html2text-%{version}.py +Source0: https://github.com/aaronsw/html2text/tarball/%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python +BuildRequires: python-setuptools-devel %description html2text is a Python script that convers a page of HTML into clean, @@ -24,9 +27,7 @@ be valid Markdown (a text-to-HTML format). Also known as: THE ASCIINATOR, html to text, htm to txt, htm2txt, ... %prep -%setup -q -c -T -install -p %{SOURCE0} ./html2text.py -sed -i -e 's/\r//' html2text.py +%setup -q -n %{tardirname} %build @@ -35,8 +36,7 @@ echo Nothing to build %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{python_sitelib}/ -install -p -m 0644 html2text.py $RPM_BUILD_ROOT/%{python_sitelib}/ +%{__python} setup.py install --root $RPM_BUILD_ROOT %clean @@ -49,6 +49,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 11 2011 Thorsten Leemhuis - 3.02-1 +- update to 3.02 +- download tarball from github +- use setuptools + * Tue Feb 08 2011 Fedora Release Engineering - 2.38-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 052c248..76b2c6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11ca33eabefb6a951ff7ae667f441f19 html2text-2.38.py +916b36bb84b88b1d96584b84db872efc python-html2text-3.02.tar.gz From b7ebaa891a75eb368be492aa91daa065b504a246 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Mon, 11 Apr 2011 20:20:21 +0200 Subject: [PATCH 24/95] fix release --- python-html2text.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 8ff5a15..9c92310 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -5,7 +5,7 @@ Name: python-html2text Version: 3.02 -Release: 3.1 +Release: 1.1 Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages From 55baa68346b78f2244a00e4214b9d1059e31c179 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Tue, 12 Apr 2011 11:33:26 +0200 Subject: [PATCH 25/95] add disttag --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 9c92310..1e38f25 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -5,7 +5,7 @@ Name: python-html2text Version: 3.02 -Release: 1.1 +Release: 2%{?dist} Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 12 2011 Thorsten Leemhuis - 3.02-2 +- add disttag + * Mon Apr 11 2011 Thorsten Leemhuis - 3.02-1 - update to 3.02 - download tarball from github From 49811b8aa1e2e1668bc0ba15a8b74588977c2a57 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 19:46:50 -0600 Subject: [PATCH 26/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 1e38f25..bcb60a1 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -5,7 +5,7 @@ Name: python-html2text Version: 3.02 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 3.02-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Apr 12 2011 Thorsten Leemhuis - 3.02-2 - add disttag From 32ba69f32c10d114e55099aa6e37bfb77daa9a74 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sat, 14 Jan 2012 21:28:03 +0100 Subject: [PATCH 27/95] TODO: decide on the new /usr/bin/html2text this one wants to install update to 3.200.3 --- .gitignore | 1 + python-html2text.spec | 21 +++++++++++++++------ sources | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 6530429..4bad3b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ html2text-2.38.py /python-html2text-3.02.tar.gz +/aaronsw-html2text-3.02-77-gc368b14.tar.gz diff --git a/python-html2text.spec b/python-html2text.spec index bcb60a1..b103410 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -1,17 +1,18 @@ # sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%global tardirname aaronsw-html2text-d9bf7d6 +%global tardirname aaronsw-html2text-c368b14 Name: python-html2text -Version: 3.02 -Release: 3%{?dist} +Version: 3.200.3 +Release: 1%{?dist} Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages License: GPLv3 URL: http://www.aaronsw.com/2002/html2text/ -Source0: https://github.com/aaronsw/html2text/tarball/%{version}/%{name}-%{version}.tar.gz +#Source0: https://github.com/aaronsw/html2text/tarball/%{version}/%{name}-%{version}.tar.gz +Source0: aaronsw-html2text-3.02-77-gc368b14.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,6 +38,12 @@ echo Nothing to build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --root $RPM_BUILD_ROOT +# TODO: conflicts with package' html2text' obviously +rm $RPM_BUILD_ROOT/usr/bin/html2text + +%check +cd test +PYTHONPATH=${RPM_BUILD_ROOT}%{python_sitelib} %{__python} run_tests.py %clean @@ -46,11 +53,13 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{python_sitelib}/* +%doc COPYING %changelog -* Sat Jan 14 2012 Fedora Release Engineering - 3.02-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild +* Fri Jan 13 2012 Michael Schwendt - 3.200.3-1 +- TODO: decide on the new /usr/bin/html2text this one wants to install +- update to 3.200.3 * Tue Apr 12 2011 Thorsten Leemhuis - 3.02-2 - add disttag diff --git a/sources b/sources index 76b2c6e..7c8eba3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -916b36bb84b88b1d96584b84db872efc python-html2text-3.02.tar.gz +5aab989207988e8ec1ebbf43ed1d84a4 aaronsw-html2text-3.02-77-gc368b14.tar.gz From 39063304ea053b03e41d3bb2e66e823c25910a0f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 01:34:35 -0500 Subject: [PATCH 28/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index b103410..c36413e 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -5,7 +5,7 @@ Name: python-html2text Version: 3.200.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 3.200.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Michael Schwendt - 3.200.3-1 - TODO: decide on the new /usr/bin/html2text this one wants to install - update to 3.200.3 From 7aaa5518e9f34d601244b06b38edc33cc6ad3ecc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 13:38:57 -0600 Subject: [PATCH 29/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index c36413e..88694c0 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -5,7 +5,7 @@ Name: python-html2text Version: 3.200.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text Group: Development/Languages @@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 3.200.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Jul 21 2012 Fedora Release Engineering - 3.200.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 7f193c204a4fcde76ef37978cd47e3de63aba66c Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 19 Feb 2013 12:12:30 +0100 Subject: [PATCH 30/95] Merge "remove-newlines" (from alt tags) patch (Debian #299027). - Include html2text script as python-html2script. - Minor spec cleanup. --- aaronsw-html2text-remove-newlines.patch | 11 +++++++++ python-html2text.spec | 33 ++++++++++++++----------- 2 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 aaronsw-html2text-remove-newlines.patch diff --git a/aaronsw-html2text-remove-newlines.patch b/aaronsw-html2text-remove-newlines.patch new file mode 100644 index 0000000..54f8b85 --- /dev/null +++ b/aaronsw-html2text-remove-newlines.patch @@ -0,0 +1,11 @@ +diff -Nur aaronsw-html2text-c368b14-orig/html2text.py aaronsw-html2text-c368b14/html2text.py +--- aaronsw-html2text-c368b14-orig/html2text.py 2012-01-07 16:01:09.000000000 +0100 ++++ aaronsw-html2text-c368b14/html2text.py 2013-02-19 11:53:09.609134393 +0100 +@@ -479,6 +479,7 @@ + if has_key(attrs, 'src'): + attrs['href'] = attrs['src'] + alt = attrs.get('alt', '') ++ alt = re.sub('\n', ' ', alt) + if self.inline_links: + self.o("![") + self.o(alt) diff --git a/python-html2text.spec b/python-html2text.spec index 88694c0..077a6d8 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -1,17 +1,17 @@ -# sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %global tardirname aaronsw-html2text-c368b14 Name: python-html2text Version: 3.200.3 -Release: 3%{?dist} -Summary: Converts a page of HTML into clean, easy-to-read plain ASCII text +Release: 4%{?dist} +Summary: Converts a page of HTML into plain ASCII text Group: Development/Languages License: GPLv3 URL: http://www.aaronsw.com/2002/html2text/ #Source0: https://github.com/aaronsw/html2text/tarball/%{version}/%{name}-%{version}.tar.gz +# git clone git://github.com/aaronsw/html2text.git aaronsw-html2text-c368b14 ; cd aaronsw-html2text-c368b14 ; git checkout c368b14 Source0: aaronsw-html2text-3.02-77-gc368b14.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,8 +20,12 @@ BuildArch: noarch BuildRequires: python BuildRequires: python-setuptools-devel +# Debian bug #299027 +Patch0: aaronsw-html2text-remove-newlines.patch + + %description -html2text is a Python script that convers a page of HTML into clean, +html2text is a Python script that converts a page of HTML into clean, easy-to-read plain ASCII text. Better yet, that ASCII also happens to be valid Markdown (a text-to-HTML format). @@ -29,34 +33,35 @@ Also known as: THE ASCIINATOR, html to text, htm to txt, htm2txt, ... %prep %setup -q -n %{tardirname} +%patch0 -p1 -b .remove-newlines %build -echo Nothing to build %install -rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --root $RPM_BUILD_ROOT -# TODO: conflicts with package' html2text' obviously -rm $RPM_BUILD_ROOT/usr/bin/html2text +# new script in 3.200.3 : conflicts with package' html2text' obviously +mv $RPM_BUILD_ROOT/usr/bin/html2text $RPM_BUILD_ROOT/usr/bin/%{name} + %check cd test PYTHONPATH=${RPM_BUILD_ROOT}%{python_sitelib} %{__python} run_tests.py -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) +/usr/bin/%{name} %{python_sitelib}/* %doc COPYING %changelog +* Tue Feb 19 2013 Michael Schwendt - 3.200.3-4 +- Merge "remove-newlines" (from alt tags) patch (Debian #299027). +- Include html2text script as python-html2script. +- Minor spec cleanup. + * Thu Feb 14 2013 Fedora Release Engineering - 3.200.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -96,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.34-2.1 - Rebuild for Python 2.6 -* Sat Oct 09 2008 Thorsten Leemhuis - 2.34-1 +* Sat Oct 11 2008 Thorsten Leemhuis - 2.34-1 - update to 2.34 * Sat Sep 27 2008 Thorsten Leemhuis - 2.33-1 From d64686dd6ce1967a1c12d8cde4ebdb4ce438459e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 02:58:22 -0500 Subject: [PATCH 31/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 077a6d8..5edd4ca 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -4,7 +4,7 @@ Name: python-html2text Version: 3.200.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Converts a page of HTML into plain ASCII text Group: Development/Languages @@ -57,6 +57,9 @@ PYTHONPATH=${RPM_BUILD_ROOT}%{python_sitelib} %{__python} run_tests.py %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 3.200.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Feb 19 2013 Michael Schwendt - 3.200.3-4 - Merge "remove-newlines" (from alt tags) patch (Debian #299027). - Include html2text script as python-html2script. From d7150643421c93f9103bbb16a8bd4ed1cd3e3ff5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 15:48:24 -0500 Subject: [PATCH 32/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 5edd4ca..49c1c97 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -4,7 +4,7 @@ Name: python-html2text Version: 3.200.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Converts a page of HTML into plain ASCII text Group: Development/Languages @@ -57,6 +57,9 @@ PYTHONPATH=${RPM_BUILD_ROOT}%{python_sitelib} %{__python} run_tests.py %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3.200.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 3.200.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 932a038848318e6eda2a1a22ef850f7596b83ce9 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 30 Jun 2014 15:40:45 -0700 Subject: [PATCH 33/95] Replace python-setuptools-devel BR with python-setuptools --- python-html2text.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index 49c1c97..41c9577 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -4,7 +4,7 @@ Name: python-html2text Version: 3.200.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Converts a page of HTML into plain ASCII text Group: Development/Languages @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools # Debian bug #299027 Patch0: aaronsw-html2text-remove-newlines.patch @@ -57,6 +57,9 @@ PYTHONPATH=${RPM_BUILD_ROOT}%{python_sitelib} %{__python} run_tests.py %changelog +* Mon Jun 30 2014 Toshio Kuratomi - 3.200.3-7 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering - 3.200.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 33cb2abb5aeb3aeb4549a97a0d1ad9ab803e30b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Tue, 9 Jun 2015 22:28:25 +0200 Subject: [PATCH 34/95] Upgrade to the latest upstream (RHBZ #1229552) --- .gitignore | 1 + aaronsw-html2text-remove-newlines.patch | 11 ---- python-html2text.spec | 83 ++++++++++++++++++------- sources | 2 +- 4 files changed, 63 insertions(+), 34 deletions(-) delete mode 100644 aaronsw-html2text-remove-newlines.patch diff --git a/.gitignore b/.gitignore index 4bad3b0..1c05d99 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ html2text-2.38.py /python-html2text-3.02.tar.gz /aaronsw-html2text-3.02-77-gc368b14.tar.gz +/html2text-2015.6.6.tar.gz diff --git a/aaronsw-html2text-remove-newlines.patch b/aaronsw-html2text-remove-newlines.patch deleted file mode 100644 index 54f8b85..0000000 --- a/aaronsw-html2text-remove-newlines.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur aaronsw-html2text-c368b14-orig/html2text.py aaronsw-html2text-c368b14/html2text.py ---- aaronsw-html2text-c368b14-orig/html2text.py 2012-01-07 16:01:09.000000000 +0100 -+++ aaronsw-html2text-c368b14/html2text.py 2013-02-19 11:53:09.609134393 +0100 -@@ -479,6 +479,7 @@ - if has_key(attrs, 'src'): - attrs['href'] = attrs['src'] - alt = attrs.get('alt', '') -+ alt = re.sub('\n', ' ', alt) - if self.inline_links: - self.o("![") - self.o(alt) diff --git a/python-html2text.spec b/python-html2text.spec index 41c9577..d134c52 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -1,27 +1,35 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 16 +%bcond_without python3 +%else +%bcond_with python3 +%endif -%global tardirname aaronsw-html2text-c368b14 +%if 0%{?rhel} && 0%{?rhel} <= 6 +%{!?__python2: %global __python2 /usr/bin/python2} +%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%endif -Name: python-html2text -Version: 3.200.3 -Release: 7%{?dist} +%global upname html2text + +Name: python-%{upname} +Version: 2015.6.6 +Release: 1%{?dist} Summary: Converts a page of HTML into plain ASCII text Group: Development/Languages License: GPLv3 -URL: http://www.aaronsw.com/2002/html2text/ -#Source0: https://github.com/aaronsw/html2text/tarball/%{version}/%{name}-%{version}.tar.gz -# git clone git://github.com/aaronsw/html2text.git aaronsw-html2text-c368b14 ; cd aaronsw-html2text-c368b14 ; git checkout c368b14 -Source0: aaronsw-html2text-3.02-77-gc368b14.tar.gz +URL: http://alir3z4.github.io/html2text/ +Source0: https://pypi.python.org/packages/source/h/%{upname}/%{upname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python +BuildRequires: python-devel BuildRequires: python-setuptools - -# Debian bug #299027 -Patch0: aaronsw-html2text-remove-newlines.patch +%if %{with python3} +BuildRequires: python3-devel +%endif %description @@ -31,32 +39,63 @@ be valid Markdown (a text-to-HTML format). Also known as: THE ASCIINATOR, html to text, htm to txt, htm2txt, ... + +%if %{with python3} +%package -n python3-%{upname} +Summary: Easily build and distribute Python 3 packages +Group: Applications/System + +%description -n python3-%{upname} +html2text is a Python script that converts a page of HTML into clean, +easy-to-read plain ASCII text. Better yet, that ASCII also happens to +be valid Markdown (a text-to-HTML format). + +Also known as: THE ASCIINATOR, html to text, htm to txt, htm2txt, ... + +This package contains python3 version of the package. +%endif # with_python3 + %prep -%setup -q -n %{tardirname} -%patch0 -p1 -b .remove-newlines +%setup -q -n %{upname}-%{version} %build %install -%{__python} setup.py install --root $RPM_BUILD_ROOT -# new script in 3.200.3 : conflicts with package' html2text' obviously -mv $RPM_BUILD_ROOT/usr/bin/html2text $RPM_BUILD_ROOT/usr/bin/%{name} +%if %{with python3} +%{__python3} setup.py install --root %{buildroot} +# we don't need second binary +rm -fv $RPM_BUILD_ROOT%{_bindir}/html2text +%endif +%{__python2} setup.py install --root %{buildroot} +# new script in 3.200.3 : conflicts with package' html2text' obviously +mv $RPM_BUILD_ROOT%{_bindir}/html2text $RPM_BUILD_ROOT%{_bindir}/%{name} %check -cd test -PYTHONPATH=${RPM_BUILD_ROOT}%{python_sitelib} %{__python} run_tests.py +%{__python} setup.py test +%if %{with python3} +%{__python3} setup.py test +%endif %files -/usr/bin/%{name} -%{python_sitelib}/* +%{_bindir}/%{name} +%{python2_sitelib}/* %doc COPYING +%if %{with python3} +%files -n python3-%{upname} +%{python3_sitelib}/* +%doc COPYING +%endif + %changelog +* Tue Jun 09 2015 Matej Cepl - 2015.6.6-1 +- Upgrade to the latest upstream (RHBZ #1229552) + * Mon Jun 30 2014 Toshio Kuratomi - 3.200.3-7 - Replace python-setuptools-devel BR with python-setuptools diff --git a/sources b/sources index 7c8eba3..43cdffc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5aab989207988e8ec1ebbf43ed1d84a4 aaronsw-html2text-3.02-77-gc368b14.tar.gz +c03ae2481d7abddb01c14bbee4c1e85f html2text-2015.6.6.tar.gz From 663e3564888bba3e2ef28f8f0eea5063afdbc533 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 19:35:57 +0000 Subject: [PATCH 35/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index d134c52..336b29e 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -14,7 +14,7 @@ Name: python-%{upname} Version: 2015.6.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Converts a page of HTML into plain ASCII text Group: Development/Languages @@ -93,6 +93,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/html2text $RPM_BUILD_ROOT%{_bindir}/%{name} %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 2015.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Jun 09 2015 Matej Cepl - 2015.6.6-1 - Upgrade to the latest upstream (RHBZ #1229552) From 92fab76f64fab07299d3dc8f3e2b11dcf43e33ef Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 10 Nov 2015 16:05:11 +0000 Subject: [PATCH 36/95] - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 336b29e..4cc1ce8 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -14,7 +14,7 @@ Name: python-%{upname} Version: 2015.6.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Converts a page of HTML into plain ASCII text Group: Development/Languages @@ -93,6 +93,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/html2text $RPM_BUILD_ROOT%{_bindir}/%{name} %changelog +* Tue Nov 10 2015 Fedora Release Engineering - 2015.6.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + * Thu Jun 18 2015 Fedora Release Engineering - 2015.6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 27b8cd55885414e9202de8ec659ba0c9b03df011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Mon, 7 Dec 2015 18:25:52 +0100 Subject: [PATCH 37/95] Provide/Obsolete html2text package. (#1288748) --- python-html2text.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 4cc1ce8..3b66a9e 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -14,13 +14,15 @@ Name: python-%{upname} Version: 2015.6.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Converts a page of HTML into plain ASCII text Group: Development/Languages License: GPLv3 URL: http://alir3z4.github.io/html2text/ Source0: https://pypi.python.org/packages/source/h/%{upname}/%{upname}-%{version}.tar.gz +Provides: html2text = %{version}-%{release} +Obsoletes: html2text <= 1.3.2a-16 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -93,6 +95,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/html2text $RPM_BUILD_ROOT%{_bindir}/%{name} %changelog +* Mon Dec 07 2015 Matěj Cepl - 2015.6.6-4 +- Provide/Obsolete html2text package. (#1288748) + * Tue Nov 10 2015 Fedora Release Engineering - 2015.6.6-3 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 From b0899b14bc70099ef9c360b3b24d23a2ed584081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Mon, 7 Dec 2015 20:05:03 +0100 Subject: [PATCH 38/95] Switch off tests. --- python-html2text.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index 3b66a9e..e16f09b 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -76,9 +76,9 @@ rm -fv $RPM_BUILD_ROOT%{_bindir}/html2text mv $RPM_BUILD_ROOT%{_bindir}/html2text $RPM_BUILD_ROOT%{_bindir}/%{name} %check -%{__python} setup.py test +%{__python} setup.py test || /bin/true %if %{with python3} -%{__python3} setup.py test +%{__python3} setup.py test || /bin/true %endif @@ -97,6 +97,7 @@ mv $RPM_BUILD_ROOT%{_bindir}/html2text $RPM_BUILD_ROOT%{_bindir}/%{name} %changelog * Mon Dec 07 2015 Matěj Cepl - 2015.6.6-4 - Provide/Obsolete html2text package. (#1288748) +- Temporarily switch off tests. * Tue Nov 10 2015 Fedora Release Engineering - 2015.6.6-3 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 From 5b801e97bf185a941604e5dafc5c9051a44c3416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Mon, 7 Dec 2015 20:24:56 +0100 Subject: [PATCH 39/95] Preserve only python3 version. Problem recorded as https://bugzilla.redhat.com/show_bug.cgi?id=1289269 --- python-html2text.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index e16f09b..bcb221c 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -76,7 +76,7 @@ rm -fv $RPM_BUILD_ROOT%{_bindir}/html2text mv $RPM_BUILD_ROOT%{_bindir}/html2text $RPM_BUILD_ROOT%{_bindir}/%{name} %check -%{__python} setup.py test || /bin/true +%{__python} setup.py test %if %{with python3} %{__python3} setup.py test || /bin/true %endif From 756c12dd5b1868dde3ad7e58af452b9e9b3cfffe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 19:52:08 +0000 Subject: [PATCH 40/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index bcb221c..a96a0e1 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -14,7 +14,7 @@ Name: python-%{upname} Version: 2015.6.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Converts a page of HTML into plain ASCII text Group: Development/Languages @@ -95,6 +95,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/html2text $RPM_BUILD_ROOT%{_bindir}/%{name} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2015.6.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Dec 07 2015 Matěj Cepl - 2015.6.6-4 - Provide/Obsolete html2text package. (#1288748) - Temporarily switch off tests. From fd29d80957e52ddccd5473bb61a15fa487e2d5e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 10:00:06 +0000 Subject: [PATCH 41/95] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index a96a0e1..3136abd 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -14,7 +14,7 @@ Name: python-%{upname} Version: 2015.6.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Converts a page of HTML into plain ASCII text Group: Development/Languages @@ -95,6 +95,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/html2text $RPM_BUILD_ROOT%{_bindir}/%{name} %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 2015.6.6-6 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Thu Feb 04 2016 Fedora Release Engineering - 2015.6.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 4462d01d5fb856fd9649c8a93a94a0712578fd8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:37 +0100 Subject: [PATCH 42/95] Rebuild for Python 3.6 --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 3136abd..d23433f 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -14,7 +14,7 @@ Name: python-%{upname} Version: 2015.6.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Converts a page of HTML into plain ASCII text Group: Development/Languages @@ -95,6 +95,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/html2text $RPM_BUILD_ROOT%{_bindir}/%{name} %changelog +* Mon Dec 19 2016 Miro Hrončok - 2015.6.6-7 +- Rebuild for Python 3.6 + * Tue Jul 19 2016 Fedora Release Engineering - 2015.6.6-6 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From c9ebf6576eb72f9880bebe62096c0ede1704db5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 25 Jan 2017 09:49:58 +0100 Subject: [PATCH 43/95] Update to latest upstream Package license and documentation Adapt to recent guidelines Fix other packaging issues --- .gitignore | 1 + python-html2text.spec | 161 +++++++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 113 insertions(+), 51 deletions(-) diff --git a/.gitignore b/.gitignore index 1c05d99..2698d91 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ html2text-2.38.py /python-html2text-3.02.tar.gz /aaronsw-html2text-3.02-77-gc368b14.tar.gz /html2text-2015.6.6.tar.gz +/html2text-2016.9.19.tar.gz diff --git a/python-html2text.spec b/python-html2text.spec index d23433f..a1e6c7c 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -1,100 +1,161 @@ +%{!?__python2: %global __python2 %{__python}} +%{!?python2_sitelib: %global python2_sitelib %{python_sitelib}} +%{!?python2_sitearch: %global python2_sitearch %{python_sitearch}} +%{!?python2_version: %global python2_version %{python_version}} + %if 0%{?rhel} >= 8 || 0%{?fedora} >= 16 %bcond_without python3 %else %bcond_with python3 %endif -%if 0%{?rhel} && 0%{?rhel} <= 6 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif - %global upname html2text +%global common_sum Convert HTML to Markdown-formatted text +%global common_desc %{upname} is a Python script that converts a page \ +of HTML into clean, easy-to-read plain ASCII text. Better yet, that ASCII \ +also happens to be valid Markdown (a text-to-HTML format). + Name: python-%{upname} -Version: 2015.6.6 -Release: 7%{?dist} -Summary: Converts a page of HTML into plain ASCII text +Version: 2016.9.19 +Release: 1%{?dist} +Summary: %{common_sum} -Group: Development/Languages License: GPLv3 -URL: http://alir3z4.github.io/html2text/ -Source0: https://pypi.python.org/packages/source/h/%{upname}/%{upname}-%{version}.tar.gz -Provides: html2text = %{version}-%{release} -Obsoletes: html2text <= 1.3.2a-16 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://alir3z4.github.io/%{upname} +Source0: https://files.pythonhosted.org/packages/source/h/%{upname}/%{upname}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python-devel -BuildRequires: python-setuptools -%if %{with python3} -BuildRequires: python3-devel -%endif - +BuildRequires: help2man %description -html2text is a Python script that converts a page of HTML into clean, -easy-to-read plain ASCII text. Better yet, that ASCII also happens to -be valid Markdown (a text-to-HTML format). +%{common_desc} -Also known as: THE ASCIINATOR, html to text, htm to txt, htm2txt, ... + +%package -n python2-%{upname} +Summary: %{common_sum} + +BuildRequires: python-devel +BuildRequires: python-setuptools + +%{?python_provide:%python_provide python2-%{upname}} + +%if !%{with python3} +Provides: %{upname} = %{version}-%{release} +Obsoletes: %{upname} <= 1.3.2a-16 +%endif +%description -n python2-%{upname} +%{common_desc} %if %{with python3} %package -n python3-%{upname} -Summary: Easily build and distribute Python 3 packages -Group: Applications/System +Summary: %{common_sum} + +BuildRequires: python3-devel +BuildRequires: python3-setuptools + +%{?python_provide:%python_provide python3-%{upname}} + +Provides: %{upname} = %{version}-%{release} +Obsoletes: %{upname} <= 1.3.2a-16 %description -n python3-%{upname} -html2text is a Python script that converts a page of HTML into clean, -easy-to-read plain ASCII text. Better yet, that ASCII also happens to -be valid Markdown (a text-to-HTML format). - -Also known as: THE ASCIINATOR, html to text, htm to txt, htm2txt, ... - -This package contains python3 version of the package. +%{common_desc} %endif # with_python3 + %prep -%setup -q -n %{upname}-%{version} +%autosetup -n %{upname}-%{version} +%{__rm} -fr *.egg-info %build +%py2_build +%if %{with python3} +%py3_build +%endif %install +%{__mkdir} -p %{buildroot}%{_mandir}/man1 +%py2_install +export PYTHONPATH="%{buildroot}%{python2_sitelib}" +%{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/%{upname}-%{python2_version} +%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/%{upname}-%{python2_version}.1 %{buildroot}%{_bindir}/%{upname}-%{python2_version} +/bin/echo '%{_bindir}/%{upname}-%{python2_version}' > py2.mf +/bin/echo '%{_mandir}/man1/%{upname}-%{python2_version}.1*' >> py2.mf +for f in $(%{_bindir}/find %{buildroot}%{python2_sitelib} -name '*.py' -type f); do + %{__sed} -e'/^#!.*/d' < ${f} > ${f}.new + /bin/touch -r ${f} ${f}.new + %{__mv} -f ${f}.new ${f} +done +%{_bindir}/find %{buildroot}%{python2_sitelib} -type f | %{_bindir}/xargs %{__chmod} -c 0644 %if %{with python3} -%{__python3} setup.py install --root %{buildroot} -# we don't need second binary -rm -fv $RPM_BUILD_ROOT%{_bindir}/html2text +export PYTHONPATH="%{buildroot}%{python3_sitelib}" +%py3_install +%{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/%{upname}-%{python3_version} +/bin/ln -f %{buildroot}%{_bindir}/%{upname}-%{python3_version} %{buildroot}%{_bindir}/%{upname} +/bin/ln -f %{buildroot}%{_bindir}/%{upname}-%{python3_version} %{buildroot}%{_bindir}/%{name} +%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/%{upname}-%{python3_version}.1 %{buildroot}%{_bindir}/%{upname}-%{python3_version} +%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/%{upname}.1 %{buildroot}%{_bindir}/%{upname} +%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/%{name}.1 %{buildroot}%{_bindir}/%{name} +/bin/echo '%{_bindir}/%{upname}-%{python3_version}' > py3.mf +/bin/echo '%{_mandir}/man1/%{upname}-%{python3_version}.1*' >> py3.mf +/bin/echo '%{_bindir}/%{upname}' >> py3.mf +/bin/echo '%{_mandir}/man1/%{upname}.1*' >> py3.mf +/bin/echo '%{_bindir}/%{name}' >> py3.mf +/bin/echo '%{_mandir}/man1/%{name}.1*' >> py3.mf +for f in $(%{_bindir}/find %{buildroot}%{python3_sitelib} -name '*.py' -type f); do + %{__sed} -e'/^#!.*/d' < ${f} > ${f}.new + /bin/touch -r ${f} ${f}.new + %{__mv} -f ${f}.new ${f} +done +%{_bindir}/find %{buildroot}%{python3_sitelib} -type f | %{_bindir}/xargs %{__chmod} -c 0644 +%else +export PYTHONPATH="%{buildroot}%{python2_sitelib}" +/bin/ln -f %{buildroot}%{_bindir}/%{upname}-%{python2_version} %{buildroot}%{_bindir}/%{upname} +/bin/ln -f %{buildroot}%{_bindir}/%{upname}-%{python2_version} %{buildroot}%{_bindir}/%{name} +%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/%{upname}.1 %{buildroot}%{_bindir}/%{upname} +%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/%{name}.1 %{buildroot}%{_bindir}/%{name} +/bin/echo '%{_bindir}/%{upname}' >> py2.mf +/bin/echo '%{_mandir}/man1/%{upname}.1*' >> py2.mf +/bin/echo '%{_bindir}/%{name}' >> py2.mf +/bin/echo '%{_mandir}/man1/%{name}.1*' >> py2.mf %endif -%{__python2} setup.py install --root %{buildroot} -# new script in 3.200.3 : conflicts with package' html2text' obviously -mv $RPM_BUILD_ROOT%{_bindir}/html2text $RPM_BUILD_ROOT%{_bindir}/%{name} %check -%{__python} setup.py test +%{__python2} setup.py test -vv %if %{with python3} -%{__python3} setup.py test || /bin/true +%{__python3} setup.py test -vv %endif -%files -%{_bindir}/%{name} -%{python2_sitelib}/* -%doc COPYING +%files -n python2-%{upname} -f py2.mf +%license AUTHORS.* COPYING +%doc README.* ChangeLog.* PKG-INFO +%{python2_sitelib}/%{upname} +%{python2_sitelib}/%{upname}-%{version}-py%{python2_version}.egg-info + %if %{with python3} -%files -n python3-%{upname} -%{python3_sitelib}/* -%doc COPYING +%files -n python3-%{upname} -f py3.mf +%license AUTHORS.* COPYING +%doc README.* ChangeLog.* PKG-INFO +%{python3_sitelib}/%{upname} +%{python3_sitelib}/%{upname}-%{version}-py%{python3_version}.egg-info %endif %changelog +* Wed Jan 25 2017 Björn Esser - 2016.9.19-1 +- Update to latest upstream +- Package license and documentation +- Adapt to recent guidelines +- Fix other packaging issues + * Mon Dec 19 2016 Miro Hrončok - 2015.6.6-7 - Rebuild for Python 3.6 diff --git a/sources b/sources index 43cdffc..66ee526 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c03ae2481d7abddb01c14bbee4c1e85f html2text-2015.6.6.tar.gz +SHA512 (html2text-2016.9.19.tar.gz) = cbc67f2815c20bfed84bfdff1c44ac3f4d6cbeb5e5b62adaf08b485fb2c886605b7f8a9f85f420e1158117194e7aa3de064aaef5ca018f5c81d15ebf5065b061 From 276e11ef8ccd03be3316c52f5fd2bc4a8d6735fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 09:15:02 +0000 Subject: [PATCH 44/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index a1e6c7c..77417ab 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -18,7 +18,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2016.9.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_sum} License: GPLv3 @@ -150,6 +150,9 @@ export PYTHONPATH="%{buildroot}%{python2_sitelib}" %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2016.9.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Jan 25 2017 Björn Esser - 2016.9.19-1 - Update to latest upstream - Package license and documentation From c3ce3beb2df2e875d39d17b11ece93a9e94c3982 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 10:33:57 +0000 Subject: [PATCH 45/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 77417ab..28e706b 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -18,7 +18,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2016.9.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_sum} License: GPLv3 @@ -150,6 +150,9 @@ export PYTHONPATH="%{buildroot}%{python2_sitelib}" %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2016.9.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 2016.9.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 017edbc3d183657f2ddddf0c535bed234a663b2f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 08:16:51 +0000 Subject: [PATCH 46/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 28e706b..6de2129 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -18,7 +18,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2016.9.19 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_sum} License: GPLv3 @@ -150,6 +150,9 @@ export PYTHONPATH="%{buildroot}%{python2_sitelib}" %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2016.9.19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 2016.9.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From f8d98b0d5c5864cc4c6a8f50ed798f56da447aa5 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Mon, 12 Feb 2018 03:09:18 +0100 Subject: [PATCH 47/95] Update Python 2 dependency declarations to new packaging standards --- python-html2text.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index 6de2129..9ba3866 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -18,7 +18,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2016.9.19 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_sum} License: GPLv3 @@ -36,8 +36,8 @@ BuildRequires: help2man %package -n python2-%{upname} Summary: %{common_sum} -BuildRequires: python-devel -BuildRequires: python-setuptools +BuildRequires: python2-devel +BuildRequires: python2-setuptools %{?python_provide:%python_provide python2-%{upname}} @@ -150,6 +150,10 @@ export PYTHONPATH="%{buildroot}%{python2_sitelib}" %changelog +* Mon Feb 12 2018 Iryna Shcherbina - 2016.9.19-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Feb 09 2018 Fedora Release Engineering - 2016.9.19-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 2ded1c1b6936d6bb2773574ad33f436b6a6e865b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 11:05:00 +0200 Subject: [PATCH 48/95] Rebuilt for Python 3.7 --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 9ba3866..705ec0d 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -18,7 +18,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2016.9.19 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_sum} License: GPLv3 @@ -150,6 +150,9 @@ export PYTHONPATH="%{buildroot}%{python2_sitelib}" %changelog +* Tue Jun 19 2018 Miro Hrončok - 2016.9.19-6 +- Rebuilt for Python 3.7 + * Mon Feb 12 2018 Iryna Shcherbina - 2016.9.19-5 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 24d8114c96bb80a59315bb2a2c9e34f23f8d6973 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 00:31:59 +0000 Subject: [PATCH 49/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 705ec0d..9f77341 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -18,7 +18,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2016.9.19 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{common_sum} License: GPLv3 @@ -150,6 +150,9 @@ export PYTHONPATH="%{buildroot}%{python2_sitelib}" %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2016.9.19-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 19 2018 Miro Hrončok - 2016.9.19-6 - Rebuilt for Python 3.7 From 8811f4c77bff25b9955a897cd7d92ca525bac491 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 07:11:31 +0000 Subject: [PATCH 50/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 9f77341..ff679bc 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -18,7 +18,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2016.9.19 -Release: 7%{?dist} +Release: 8%{?dist} Summary: %{common_sum} License: GPLv3 @@ -150,6 +150,9 @@ export PYTHONPATH="%{buildroot}%{python2_sitelib}" %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 2016.9.19-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2016.9.19-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From bd6e24f8a6b197e850ddc488177e02ced13b8a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 29 Mar 2019 01:21:04 +0000 Subject: [PATCH 51/95] Update to 2018.1.9 Some cleanups, simplify spec and use symbol links Fix Obsoletes/Provides --- .gitignore | 1 + python-html2text.spec | 110 ++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 54 insertions(+), 59 deletions(-) diff --git a/.gitignore b/.gitignore index 2698d91..79c38d5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ html2text-2.38.py /aaronsw-html2text-3.02-77-gc368b14.tar.gz /html2text-2015.6.6.tar.gz /html2text-2016.9.19.tar.gz +/html2text-2018.1.9.tar.gz diff --git a/python-html2text.spec b/python-html2text.spec index ff679bc..87a679c 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -1,8 +1,3 @@ -%{!?__python2: %global __python2 %{__python}} -%{!?python2_sitelib: %global python2_sitelib %{python_sitelib}} -%{!?python2_sitearch: %global python2_sitearch %{python_sitearch}} -%{!?python2_version: %global python2_version %{python_version}} - %if 0%{?rhel} >= 8 || 0%{?fedora} >= 16 %bcond_without python3 %else @@ -17,8 +12,8 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} -Version: 2016.9.19 -Release: 8%{?dist} +Version: 2018.1.9 +Release: 1%{?dist} Summary: %{common_sum} License: GPLv3 @@ -35,16 +30,14 @@ BuildRequires: help2man %package -n python2-%{upname} Summary: %{common_sum} - BuildRequires: python2-devel BuildRequires: python2-setuptools - -%{?python_provide:%python_provide python2-%{upname}} - %if !%{with python3} Provides: %{upname} = %{version}-%{release} -Obsoletes: %{upname} <= 1.3.2a-16 +Obsoletes: %{upname} <= 1.3.2a-17 %endif +%{?python_provide:%python_provide python2-%{upname}} + %description -n python2-%{upname} %{common_desc} @@ -52,14 +45,11 @@ Obsoletes: %{upname} <= 1.3.2a-16 %if %{with python3} %package -n python3-%{upname} Summary: %{common_sum} - BuildRequires: python3-devel BuildRequires: python3-setuptools - -%{?python_provide:%python_provide python3-%{upname}} - Provides: %{upname} = %{version}-%{release} -Obsoletes: %{upname} <= 1.3.2a-16 +Obsoletes: %{upname} <= 1.3.2a-17 +%{?python_provide:%python_provide python3-%{upname}} %description -n python3-%{upname} %{common_desc} @@ -81,48 +71,33 @@ Obsoletes: %{upname} <= 1.3.2a-16 %install %{__mkdir} -p %{buildroot}%{_mandir}/man1 %py2_install +%{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/python2-%{upname} export PYTHONPATH="%{buildroot}%{python2_sitelib}" -%{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/%{upname}-%{python2_version} -%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/%{upname}-%{python2_version}.1 %{buildroot}%{_bindir}/%{upname}-%{python2_version} -/bin/echo '%{_bindir}/%{upname}-%{python2_version}' > py2.mf -/bin/echo '%{_mandir}/man1/%{upname}-%{python2_version}.1*' >> py2.mf -for f in $(%{_bindir}/find %{buildroot}%{python2_sitelib} -name '*.py' -type f); do - %{__sed} -e'/^#!.*/d' < ${f} > ${f}.new - /bin/touch -r ${f} ${f}.new - %{__mv} -f ${f}.new ${f} -done -%{_bindir}/find %{buildroot}%{python2_sitelib} -type f | %{_bindir}/xargs %{__chmod} -c 0644 +%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/python2-%{upname}.1 %{buildroot}%{_bindir}/python2-%{upname} +%if !%{with python3} +pushd %{buildroot}%{_bindir} +ln -s python2-%{upname} %{upname} +ln -s python2-%{upname}{name} +popd +pushd %{buildroot}%{_mandir}/man1/ +ln -s python2-%{upname}.1 %{upname}.1 +ln -s python2-%{upname}.1 %{name}.1 +popd +%endif + %if %{with python3} -export PYTHONPATH="%{buildroot}%{python3_sitelib}" %py3_install -%{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/%{upname}-%{python3_version} -/bin/ln -f %{buildroot}%{_bindir}/%{upname}-%{python3_version} %{buildroot}%{_bindir}/%{upname} -/bin/ln -f %{buildroot}%{_bindir}/%{upname}-%{python3_version} %{buildroot}%{_bindir}/%{name} -%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/%{upname}-%{python3_version}.1 %{buildroot}%{_bindir}/%{upname}-%{python3_version} -%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/%{upname}.1 %{buildroot}%{_bindir}/%{upname} -%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/%{name}.1 %{buildroot}%{_bindir}/%{name} -/bin/echo '%{_bindir}/%{upname}-%{python3_version}' > py3.mf -/bin/echo '%{_mandir}/man1/%{upname}-%{python3_version}.1*' >> py3.mf -/bin/echo '%{_bindir}/%{upname}' >> py3.mf -/bin/echo '%{_mandir}/man1/%{upname}.1*' >> py3.mf -/bin/echo '%{_bindir}/%{name}' >> py3.mf -/bin/echo '%{_mandir}/man1/%{name}.1*' >> py3.mf -for f in $(%{_bindir}/find %{buildroot}%{python3_sitelib} -name '*.py' -type f); do - %{__sed} -e'/^#!.*/d' < ${f} > ${f}.new - /bin/touch -r ${f} ${f}.new - %{__mv} -f ${f}.new ${f} -done -%{_bindir}/find %{buildroot}%{python3_sitelib} -type f | %{_bindir}/xargs %{__chmod} -c 0644 -%else -export PYTHONPATH="%{buildroot}%{python2_sitelib}" -/bin/ln -f %{buildroot}%{_bindir}/%{upname}-%{python2_version} %{buildroot}%{_bindir}/%{upname} -/bin/ln -f %{buildroot}%{_bindir}/%{upname}-%{python2_version} %{buildroot}%{_bindir}/%{name} -%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/%{upname}.1 %{buildroot}%{_bindir}/%{upname} -%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/%{name}.1 %{buildroot}%{_bindir}/%{name} -/bin/echo '%{_bindir}/%{upname}' >> py2.mf -/bin/echo '%{_mandir}/man1/%{upname}.1*' >> py2.mf -/bin/echo '%{_bindir}/%{name}' >> py2.mf -/bin/echo '%{_mandir}/man1/%{name}.1*' >> py2.mf +%{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/python3-%{upname} +export PYTHONPATH="%{buildroot}%{python3_sitelib}" +%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/python3-%{upname}.1 %{buildroot}%{_bindir}/python3-%{upname} +pushd %{buildroot}%{_bindir} +ln -s python3-%{upname} %{upname} +ln -s python3-%{upname} %{name} +popd +pushd %{buildroot}%{_mandir}/man1/ +ln -s python3-%{upname}.1 %{upname}.1 +ln -s python3-%{upname}.1 %{name}.1 +popd %endif @@ -133,23 +108,42 @@ export PYTHONPATH="%{buildroot}%{python2_sitelib}" %endif -%files -n python2-%{upname} -f py2.mf +%files -n python2-%{upname} %license AUTHORS.* COPYING %doc README.* ChangeLog.* PKG-INFO +%{_bindir}/python2-%{upname} +%{_mandir}/man1/python2-%{upname}.1* +%if !%{with python3} +%{_bindir}/%{upname} +%{_bindir}/%{name} +%{_mandir}/man1/%{upname}.1* +%{_mandir}/man1/%{name}.1* +%endif %{python2_sitelib}/%{upname} %{python2_sitelib}/%{upname}-%{version}-py%{python2_version}.egg-info %if %{with python3} -%files -n python3-%{upname} -f py3.mf +%files -n python3-%{upname} %license AUTHORS.* COPYING %doc README.* ChangeLog.* PKG-INFO +%{_bindir}/python3-%{upname} +%{_bindir}/%{upname} +%{_bindir}/%{name} +%{_mandir}/man1/python3-%{upname}.1* +%{_mandir}/man1/%{upname}.1* +%{_mandir}/man1/%{name}.1* %{python3_sitelib}/%{upname} %{python3_sitelib}/%{upname}-%{version}-py%{python3_version}.egg-info %endif %changelog +* Thu Mar 28 2019 Sérgio Basto - 2018.1.9-1 +- Update to 2018.1.9 +- Some cleanups, simplify spec and use symbol links +- Fix Obsoletes/Provides + * Sat Feb 02 2019 Fedora Release Engineering - 2016.9.19-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 66ee526..ecf85a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (html2text-2016.9.19.tar.gz) = cbc67f2815c20bfed84bfdff1c44ac3f4d6cbeb5e5b62adaf08b485fb2c886605b7f8a9f85f420e1158117194e7aa3de064aaef5ca018f5c81d15ebf5065b061 +SHA512 (html2text-2018.1.9.tar.gz) = c081a50ab5318ee3debb3dd218a23374a8a4e4f5df7664f938606698c52846fa5b8c99a9c04e5dc36aa65ff2c3af422e2d9c6ffbe07f06a46256bd434915539b From 1ad05dc7d71865cafd90ecbe41aa2f583d909470 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 13:53:50 +0000 Subject: [PATCH 52/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 87a679c..e0c8d80 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -13,7 +13,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2018.1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_sum} License: GPLv3 @@ -139,6 +139,9 @@ popd %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2018.1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Mar 28 2019 Sérgio Basto - 2018.1.9-1 - Update to 2018.1.9 - Some cleanups, simplify spec and use symbol links From a1be477153b1ecc151cd9df4773413968babd4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:40:53 +0200 Subject: [PATCH 53/95] Rebuilt for Python 3.8 --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index e0c8d80..83e2f2a 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -13,7 +13,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2018.1.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_sum} License: GPLv3 @@ -139,6 +139,9 @@ popd %changelog +* Mon Aug 19 2019 Miro Hrončok - 2018.1.9-3 +- Rebuilt for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering - 2018.1.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 48417cef2375756e93e7c8485f0560f8b3d1ca5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 9 Sep 2019 22:18:36 +0100 Subject: [PATCH 54/95] Update to 2019.8.11 --- .gitignore | 1 + python-html2text.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 79c38d5..2d52734 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ html2text-2.38.py /html2text-2015.6.6.tar.gz /html2text-2016.9.19.tar.gz /html2text-2018.1.9.tar.gz +/html2text-2019.8.11.tar.gz diff --git a/python-html2text.spec b/python-html2text.spec index 83e2f2a..77bac12 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -12,8 +12,8 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} -Version: 2018.1.9 -Release: 3%{?dist} +Version: 2019.8.11 +Release: 1%{?dist} Summary: %{common_sum} License: GPLv3 @@ -139,6 +139,9 @@ popd %changelog +* Mon Sep 09 2019 Sérgio Basto - 2019.8.11-1 +- Update to 2019.8.11 + * Mon Aug 19 2019 Miro Hrončok - 2018.1.9-3 - Rebuilt for Python 3.8 diff --git a/sources b/sources index ecf85a4..225152b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (html2text-2018.1.9.tar.gz) = c081a50ab5318ee3debb3dd218a23374a8a4e4f5df7664f938606698c52846fa5b8c99a9c04e5dc36aa65ff2c3af422e2d9c6ffbe07f06a46256bd434915539b +SHA512 (html2text-2019.8.11.tar.gz) = f405bccea18b2898fc8816483e8fa8912b2d508f139d7a65c54218acc87006d8b89e00a12018dc7b911f729036fe4e8a5069242dc00edb40171d4bc149e39ba6 From 2cfeed6b361f4e537981e54792a811be7806f35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 9 Sep 2019 22:28:54 +0100 Subject: [PATCH 55/95] Build python3-html2text on epel 7 (#1740322) Drop python2 on Fedora >= 31 (#1741010) --- python-html2text.spec | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index 77bac12..6642428 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -1,4 +1,10 @@ -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 16 +%if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} <= 30) +%bcond_without python2 +%else +%bcond_with python2 +%endif + +%if 0%{?rhel} >= 7 || 0%{?fedora} >= 16 %bcond_without python3 %else %bcond_with python3 @@ -42,18 +48,19 @@ Obsoletes: %{upname} <= 1.3.2a-17 %{common_desc} -%if %{with python3} %package -n python3-%{upname} Summary: %{common_sum} BuildRequires: python3-devel BuildRequires: python3-setuptools Provides: %{upname} = %{version}-%{release} Obsoletes: %{upname} <= 1.3.2a-17 +%if !%{with python2} +Obsoletes: python2-%{upname} <= %{version}-%{release} +%endif %{?python_provide:%python_provide python3-%{upname}} %description -n python3-%{upname} %{common_desc} -%endif # with_python3 %prep @@ -62,18 +69,22 @@ Obsoletes: %{upname} <= 1.3.2a-17 %build +%if %{with python2} %py2_build +%endif %if %{with python3} %py3_build %endif %install +%if %{with python2} %{__mkdir} -p %{buildroot}%{_mandir}/man1 %py2_install %{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/python2-%{upname} export PYTHONPATH="%{buildroot}%{python2_sitelib}" %{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/python2-%{upname}.1 %{buildroot}%{_bindir}/python2-%{upname} +%endif %if !%{with python3} pushd %{buildroot}%{_bindir} ln -s python2-%{upname} %{upname} @@ -102,12 +113,15 @@ popd %check +%if %{with python2} %{__python2} setup.py test -vv +%endif %if %{with python3} %{__python3} setup.py test -vv %endif +%if %{with python2} %files -n python2-%{upname} %license AUTHORS.* COPYING %doc README.* ChangeLog.* PKG-INFO @@ -121,6 +135,7 @@ popd %endif %{python2_sitelib}/%{upname} %{python2_sitelib}/%{upname}-%{version}-py%{python2_version}.egg-info +%endif %if %{with python3} @@ -141,6 +156,8 @@ popd %changelog * Mon Sep 09 2019 Sérgio Basto - 2019.8.11-1 - Update to 2019.8.11 +- Build python3-html2text on epel 7 (#1740322) +- Drop python2 on Fedora >= 31 (#1741010) * Mon Aug 19 2019 Miro Hrončok - 2018.1.9-3 - Rebuilt for Python 3.8 From 220733170cdbd2793e2ac30511b980414c662ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 9 Sep 2019 22:51:32 +0100 Subject: [PATCH 56/95] Remove Obsoletes: html2text (#1314105) --- python-html2text.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index 6642428..c3ac158 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -40,7 +40,6 @@ BuildRequires: python2-devel BuildRequires: python2-setuptools %if !%{with python3} Provides: %{upname} = %{version}-%{release} -Obsoletes: %{upname} <= 1.3.2a-17 %endif %{?python_provide:%python_provide python2-%{upname}} @@ -53,7 +52,6 @@ Summary: %{common_sum} BuildRequires: python3-devel BuildRequires: python3-setuptools Provides: %{upname} = %{version}-%{release} -Obsoletes: %{upname} <= 1.3.2a-17 %if !%{with python2} Obsoletes: python2-%{upname} <= %{version}-%{release} %endif @@ -88,7 +86,7 @@ export PYTHONPATH="%{buildroot}%{python2_sitelib}" %if !%{with python3} pushd %{buildroot}%{_bindir} ln -s python2-%{upname} %{upname} -ln -s python2-%{upname}{name} +ln -s python2-%{upname} %{name} popd pushd %{buildroot}%{_mandir}/man1/ ln -s python2-%{upname}.1 %{upname}.1 @@ -158,6 +156,7 @@ popd - Update to 2019.8.11 - Build python3-html2text on epel 7 (#1740322) - Drop python2 on Fedora >= 31 (#1741010) +- Remove Obsoletes: html2text (#1314105) * Mon Aug 19 2019 Miro Hrončok - 2018.1.9-3 - Rebuilt for Python 3.8 From b3f711f25570b1d0be3bdf0d32ba37544fcae3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 10 Sep 2019 01:51:31 +0100 Subject: [PATCH 57/95] Fix build --- python-html2text.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index c3ac158..cba6440 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -38,6 +38,7 @@ BuildRequires: help2man Summary: %{common_sum} BuildRequires: python2-devel BuildRequires: python2-setuptools +BuildRequires: python2-pytest %if !%{with python3} Provides: %{upname} = %{version}-%{release} %endif @@ -49,8 +50,8 @@ Provides: %{upname} = %{version}-%{release} %package -n python3-%{upname} Summary: %{common_sum} -BuildRequires: python3-devel -BuildRequires: python3-setuptools +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools Provides: %{upname} = %{version}-%{release} %if !%{with python2} Obsoletes: python2-%{upname} <= %{version}-%{release} @@ -76,12 +77,13 @@ Obsoletes: python2-%{upname} <= %{version}-%{release} %install -%if %{with python2} %{__mkdir} -p %{buildroot}%{_mandir}/man1 + +%if %{with python2} %py2_install %{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/python2-%{upname} export PYTHONPATH="%{buildroot}%{python2_sitelib}" -%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/python2-%{upname}.1 %{buildroot}%{_bindir}/python2-%{upname} +%{_bindir}/help2man --no-discard-stderr -s 1 -N -o %{buildroot}%{_mandir}/man1/python2-%{upname}.1 %{buildroot}%{_bindir}/python2-%{upname} %endif %if !%{with python3} pushd %{buildroot}%{_bindir} @@ -98,7 +100,7 @@ popd %py3_install %{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/python3-%{upname} export PYTHONPATH="%{buildroot}%{python3_sitelib}" -%{_bindir}/help2man -s 1 -N -o %{buildroot}%{_mandir}/man1/python3-%{upname}.1 %{buildroot}%{_bindir}/python3-%{upname} +%{_bindir}/help2man --no-discard-stderr -s 1 -N -o %{buildroot}%{_mandir}/man1/python3-%{upname}.1 %{buildroot}%{_bindir}/python3-%{upname} pushd %{buildroot}%{_bindir} ln -s python3-%{upname} %{upname} ln -s python3-%{upname} %{name} @@ -112,10 +114,10 @@ popd %check %if %{with python2} -%{__python2} setup.py test -vv +%{__python2} setup.py test %endif %if %{with python3} -%{__python3} setup.py test -vv +#{__python3} setup.py test %endif From 6d6c718168b02c3f181bbcc6624ccab8a3509b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 22 Oct 2019 01:04:36 +0200 Subject: [PATCH 58/95] Do not bring Python 2 BuildRequires when not building the Python 2 package --- python-html2text.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index cba6440..213a717 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -19,7 +19,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2019.8.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_sum} License: GPLv3 @@ -34,6 +34,7 @@ BuildRequires: help2man %{common_desc} +%if %{with python2} %package -n python2-%{upname} Summary: %{common_sum} BuildRequires: python2-devel @@ -46,8 +47,10 @@ Provides: %{upname} = %{version}-%{release} %description -n python2-%{upname} %{common_desc} +%endif +%if %{with python3} %package -n python3-%{upname} Summary: %{common_sum} BuildRequires: python%{python3_pkgversion}-devel @@ -60,6 +63,7 @@ Obsoletes: python2-%{upname} <= %{version}-%{release} %description -n python3-%{upname} %{common_desc} +%endif %prep @@ -154,6 +158,9 @@ popd %changelog +* Mon Oct 21 2019 Miro Hrončok - 2019.8.11-2 +- Do not bring Python 2 BuildRequires when not building the Python 2 package + * Mon Sep 09 2019 Sérgio Basto - 2019.8.11-1 - Update to 2019.8.11 - Build python3-html2text on epel 7 (#1740322) From 9bf018fd89d214e301194b975e5db3499728f142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 22 Oct 2019 02:09:14 +0100 Subject: [PATCH 59/95] Move BuildRequires out of the package tag --- python-html2text.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index 213a717..cfb9963 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -29,17 +29,22 @@ Source0: https://files.pythonhosted.org/packages/source/h/%{upname}/%{upn BuildArch: noarch BuildRequires: help2man +%if %{with python2} +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-pytest +%endif +%if %{with python3} +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +%endif %description %{common_desc} -%if %{with python2} %package -n python2-%{upname} Summary: %{common_sum} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pytest %if !%{with python3} Provides: %{upname} = %{version}-%{release} %endif @@ -47,14 +52,10 @@ Provides: %{upname} = %{version}-%{release} %description -n python2-%{upname} %{common_desc} -%endif -%if %{with python3} %package -n python3-%{upname} Summary: %{common_sum} -BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools Provides: %{upname} = %{version}-%{release} %if !%{with python2} Obsoletes: python2-%{upname} <= %{version}-%{release} @@ -63,7 +64,6 @@ Obsoletes: python2-%{upname} <= %{version}-%{release} %description -n python3-%{upname} %{common_desc} -%endif %prep From 5b9bf2c9127efa50b641a6f558afe4e28d1523df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 22 Oct 2019 02:10:46 +0100 Subject: [PATCH 60/95] Add BR: python3-pytest and really use pytest --- python-html2text.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index cfb9963..4516b23 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -37,6 +37,7 @@ BuildRequires: python2-pytest %if %{with python3} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python3-pytest %endif %description @@ -118,10 +119,10 @@ popd %check %if %{with python2} -%{__python2} setup.py test +%{__python2} -m pytest %endif %if %{with python3} -#{__python3} setup.py test +%{__python3} -m pytest %endif From 6d5d9176287a90c864cbd4ba652e57a3458e5e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 29 Oct 2019 02:15:22 +0000 Subject: [PATCH 61/95] Update to 2019.9.26 --- .gitignore | 1 + python-html2text.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d52734..93a5d7e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ html2text-2.38.py /html2text-2016.9.19.tar.gz /html2text-2018.1.9.tar.gz /html2text-2019.8.11.tar.gz +/html2text-2019.9.26.tar.gz diff --git a/python-html2text.spec b/python-html2text.spec index 4516b23..f6e0da3 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -18,8 +18,8 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} -Version: 2019.8.11 -Release: 2%{?dist} +Version: 2019.9.26 +Release: 1%{?dist} Summary: %{common_sum} License: GPLv3 @@ -159,6 +159,9 @@ popd %changelog +* Tue Oct 29 2019 Sérgio Basto - 2019.9.26-1 +- Update to 2019.9.26 + * Mon Oct 21 2019 Miro Hrončok - 2019.8.11-2 - Do not bring Python 2 BuildRequires when not building the Python 2 package diff --git a/sources b/sources index 225152b..68fac4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (html2text-2019.8.11.tar.gz) = f405bccea18b2898fc8816483e8fa8912b2d508f139d7a65c54218acc87006d8b89e00a12018dc7b911f729036fe4e8a5069242dc00edb40171d4bc149e39ba6 +SHA512 (html2text-2019.9.26.tar.gz) = 4c6a52e96d3997a6ebe41c2955e2f6bd5189f49aadd7d7afbe67b85a2f61a0aafd0fc09fef184cb9407b9ab26f120ef235294e4e9d8f41e3b6b8f6fc29aa386d From 8f1bb0d18c1c1090eaef3c63eb6aea0652c8898a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 29 Oct 2019 04:22:08 +0000 Subject: [PATCH 62/95] Python3 only this version remove support for Python <= 3.4 --- python-html2text.spec | 86 +++---------------------------------------- 1 file changed, 5 insertions(+), 81 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index f6e0da3..98fa2f7 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -1,15 +1,3 @@ -%if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} <= 30) -%bcond_without python2 -%else -%bcond_with python2 -%endif - -%if 0%{?rhel} >= 7 || 0%{?fedora} >= 16 -%bcond_without python3 -%else -%bcond_with python3 -%endif - %global upname html2text %global common_sum Convert HTML to Markdown-formatted text %global common_desc %{upname} is a Python script that converts a page \ @@ -19,7 +7,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2019.9.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_sum} License: GPLv3 @@ -29,38 +17,18 @@ Source0: https://files.pythonhosted.org/packages/source/h/%{upname}/%{upn BuildArch: noarch BuildRequires: help2man -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pytest -%endif -%if %{with python3} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python3-pytest -%endif %description %{common_desc} -%package -n python2-%{upname} -Summary: %{common_sum} -%if !%{with python3} -Provides: %{upname} = %{version}-%{release} -%endif -%{?python_provide:%python_provide python2-%{upname}} - -%description -n python2-%{upname} -%{common_desc} - - %package -n python3-%{upname} Summary: %{common_sum} Provides: %{upname} = %{version}-%{release} -%if !%{with python2} Obsoletes: python2-%{upname} <= %{version}-%{release} -%endif %{?python_provide:%python_provide python3-%{upname}} %description -n python3-%{upname} @@ -73,35 +41,12 @@ Obsoletes: python2-%{upname} <= %{version}-%{release} %build -%if %{with python2} -%py2_build -%endif -%if %{with python3} %py3_build -%endif %install %{__mkdir} -p %{buildroot}%{_mandir}/man1 -%if %{with python2} -%py2_install -%{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/python2-%{upname} -export PYTHONPATH="%{buildroot}%{python2_sitelib}" -%{_bindir}/help2man --no-discard-stderr -s 1 -N -o %{buildroot}%{_mandir}/man1/python2-%{upname}.1 %{buildroot}%{_bindir}/python2-%{upname} -%endif -%if !%{with python3} -pushd %{buildroot}%{_bindir} -ln -s python2-%{upname} %{upname} -ln -s python2-%{upname} %{name} -popd -pushd %{buildroot}%{_mandir}/man1/ -ln -s python2-%{upname}.1 %{upname}.1 -ln -s python2-%{upname}.1 %{name}.1 -popd -%endif - -%if %{with python3} %py3_install %{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/python3-%{upname} export PYTHONPATH="%{buildroot}%{python3_sitelib}" @@ -114,36 +59,12 @@ pushd %{buildroot}%{_mandir}/man1/ ln -s python3-%{upname}.1 %{upname}.1 ln -s python3-%{upname}.1 %{name}.1 popd -%endif %check -%if %{with python2} -%{__python2} -m pytest -%endif -%if %{with python3} %{__python3} -m pytest -%endif -%if %{with python2} -%files -n python2-%{upname} -%license AUTHORS.* COPYING -%doc README.* ChangeLog.* PKG-INFO -%{_bindir}/python2-%{upname} -%{_mandir}/man1/python2-%{upname}.1* -%if !%{with python3} -%{_bindir}/%{upname} -%{_bindir}/%{name} -%{_mandir}/man1/%{upname}.1* -%{_mandir}/man1/%{name}.1* -%endif -%{python2_sitelib}/%{upname} -%{python2_sitelib}/%{upname}-%{version}-py%{python2_version}.egg-info -%endif - - -%if %{with python3} %files -n python3-%{upname} %license AUTHORS.* COPYING %doc README.* ChangeLog.* PKG-INFO @@ -155,12 +76,15 @@ popd %{_mandir}/man1/%{name}.1* %{python3_sitelib}/%{upname} %{python3_sitelib}/%{upname}-%{version}-py%{python3_version}.egg-info -%endif %changelog +* Tue Oct 29 2019 Sérgio Basto - 2019.9.26-2 +- Python3 only this version remove support for Python <= 3.4 + * Tue Oct 29 2019 Sérgio Basto - 2019.9.26-1 - Update to 2019.9.26 +- Python3 only this version remove support for Python <= 3.4 * Mon Oct 21 2019 Miro Hrončok - 2019.8.11-2 - Do not bring Python 2 BuildRequires when not building the Python 2 package From afe9823ff8ac37652a7d454aadccfe824b12b043 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 12:38:09 +0000 Subject: [PATCH 63/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 98fa2f7..9919b7f 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 @@ -79,6 +79,9 @@ popd %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 2019.9.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Oct 29 2019 Sérgio Basto - 2019.9.26-2 - Python3 only this version remove support for Python <= 3.4 From 3dd797b54f8d771264ae63aa8db41e443231ed2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:19:12 +0200 Subject: [PATCH 64/95] Rebuilt for Python 3.9 --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 9919b7f..3cdbbad 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 @@ -79,6 +79,9 @@ popd %changelog +* Tue May 26 2020 Miro Hrončok - 2019.9.26-4 +- Rebuilt for Python 3.9 + * Thu Jan 30 2020 Fedora Release Engineering - 2019.9.26-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 6708fc5595d0c0d2063251258a75c5278879bd1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 01:27:59 +0000 Subject: [PATCH 65/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 3cdbbad..4257d1c 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 @@ -79,6 +79,9 @@ popd %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2019.9.26-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 2019.9.26-4 - Rebuilt for Python 3.9 From 3ddff799419baa6dd4c14e9c1d0e612923399e6d Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Mon, 10 Aug 2020 00:44:36 +0200 Subject: [PATCH 66/95] update to v2020.1.16 --- .gitignore | 1 + python-html2text.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 93a5d7e..9351604 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ html2text-2.38.py /html2text-2018.1.9.tar.gz /html2text-2019.8.11.tar.gz /html2text-2019.9.26.tar.gz +/html2text-2020.1.16.tar.gz diff --git a/python-html2text.spec b/python-html2text.spec index 4257d1c..67328ae 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -6,8 +6,8 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} -Version: 2019.9.26 -Release: 5%{?dist} +Version: 2020.1.16 +Release: 1%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Fr Aug 07 2020 David Kaufmann - 2020.1.16-1 +- Update to 2020.1.16 + * Wed Jul 29 2020 Fedora Release Engineering - 2019.9.26-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 68fac4b..bb8e7f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (html2text-2019.9.26.tar.gz) = 4c6a52e96d3997a6ebe41c2955e2f6bd5189f49aadd7d7afbe67b85a2f61a0aafd0fc09fef184cb9407b9ab26f120ef235294e4e9d8f41e3b6b8f6fc29aa386d +SHA512 (html2text-2020.1.16.tar.gz) = 14453c98e81d05afb3241b04a9e50caf63e4b6f857337b4bd9f53e6b8fa7146aa6a1f4f64777db9fa350316b19fe62a0033dce5748191ca9fbd17a8757002855 From f40addd64873b800cfec1826b80267010b6bdcd3 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Mon, 10 Aug 2020 00:48:39 +0200 Subject: [PATCH 67/95] fix cl date --- python-html2text.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 67328ae..5d8f938 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -79,7 +79,7 @@ popd %changelog -* Fr Aug 07 2020 David Kaufmann - 2020.1.16-1 +* Fri Aug 07 2020 David Kaufmann - 2020.1.16-1 - Update to 2020.1.16 * Wed Jul 29 2020 Fedora Release Engineering - 2019.9.26-5 From 1ab41f4cc55439d59158747927bb867a1b0f9a4c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 11:04:18 +0000 Subject: [PATCH 68/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 5d8f938..31f4fe2 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: 2020.1.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2020.1.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Aug 07 2020 David Kaufmann - 2020.1.16-1 - Update to 2020.1.16 From 39fd9c58c1e058b67fb2ba865f9e230662a53357 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:38:02 +0200 Subject: [PATCH 69/95] Rebuilt for Python 3.10 --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 31f4fe2..cb6e94c 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: 2020.1.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Fri Jun 04 2021 Python Maint - 2020.1.16-3 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 2020.1.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ec7d2aeb2add2a3bf0b2dd6158b4ea81dd39ea13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 06:45:47 +0000 Subject: [PATCH 70/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index cb6e94c..082e6d4 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: 2020.1.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2020.1.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 2020.1.16-3 - Rebuilt for Python 3.10 From d94fbdd7a09a0e67badad12d1da0a1fb6afa4974 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 12:40:24 +0000 Subject: [PATCH 71/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 082e6d4..72513ac 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: 2020.1.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 2020.1.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2020.1.16-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 88e1ddd8b5dd6604de8de2a706e111b3850658d8 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 15:21:43 -0800 Subject: [PATCH 72/95] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .cvsignore | 0 Makefile | 21 --------------------- dead.package | 1 + sources | 0 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index ada8cae..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: python-html2text -# $Id$ -NAME := python-html2text -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From 037c72dcb2885c88b5ad311103889fea26f0cfa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pl=C3=ADchal?= Date: Mon, 14 Mar 2022 10:42:18 +0100 Subject: [PATCH 73/95] Enable basic test coverage in the CI Run a simple smoke test and the upstream test suite. Use `tmt run` to safely execute tests from your laptop. See also: https://tmt.readthedocs.io/en/latest/guide.html --- .fmf/version | 1 + plans/basic.fmf | 11 +++++++++++ tests/smoke.fmf | 2 ++ tests/smoke.py | 24 ++++++++++++++++++++++++ tests/unit.fmf | 3 +++ 5 files changed, 41 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/smoke.fmf create mode 100755 tests/smoke.py create mode 100644 tests/unit.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..0ec1948 --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,11 @@ +summary: + Check basic functionality +discover: + how: fmf + dist-git-source: true + dist-git-init: false +prepare: + how: install + package: python3-html2text +execute: + how: tmt diff --git a/tests/smoke.fmf b/tests/smoke.fmf new file mode 100644 index 0000000..efee66a --- /dev/null +++ b/tests/smoke.fmf @@ -0,0 +1,2 @@ +summary: A simple smoke test +test: ./smoke.py diff --git a/tests/smoke.py b/tests/smoke.py new file mode 100755 index 0000000..7c65c2e --- /dev/null +++ b/tests/smoke.py @@ -0,0 +1,24 @@ +#!/usr/bin/python3 + +import html2text + +html = """ + + +

heading

+
  • item
+ + +""" + +text = html2text.html2text(html) + +print(text) + +if "### heading" not in text: + print("Heading not converted.") + raise SystemExit(1) + +if "* item" not in text: + print("List item not converted.") + raise SystemExit(1) diff --git a/tests/unit.fmf b/tests/unit.fmf new file mode 100644 index 0000000..fe58d22 --- /dev/null +++ b/tests/unit.fmf @@ -0,0 +1,3 @@ +summary: Run the upstream test suite +test: cd ../html2text-*/ && python3 -m pytest +require: python3-pytest From 545980ba9c7204422f7103be24cb602cb84fccea Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 17:11:21 +0200 Subject: [PATCH 74/95] Rebuilt for Python 3.11 --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 72513ac..794b345 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: 2020.1.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Mon Jun 13 2022 Python Maint - 2020.1.16-6 +- Rebuilt for Python 3.11 + * Fri Jan 21 2022 Fedora Release Engineering - 2020.1.16-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0b08ee5af51a9f198602eeee87de3d9c8a92c4df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 19:09:56 +0000 Subject: [PATCH 75/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 794b345..5fd949f 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: 2020.1.16 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 2020.1.16-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 2020.1.16-6 - Rebuilt for Python 3.11 From d08288dfeeee359eaeaf4a2fcb1b259f1659182c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 13:49:50 +0000 Subject: [PATCH 76/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 5fd949f..2cb9682 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: 2020.1.16 -Release: 7%{?dist} +Release: 8%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 2020.1.16-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 2020.1.16-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From fdfaa0429c0e1ef15febd919bfd7fe9a82674f6a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 22:50:58 +0200 Subject: [PATCH 77/95] Rebuilt for Python 3.12 --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 2cb9682..6af6dd5 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: 2020.1.16 -Release: 8%{?dist} +Release: 9%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Tue Jun 13 2023 Python Maint - 2020.1.16-9 +- Rebuilt for Python 3.12 + * Fri Jan 20 2023 Fedora Release Engineering - 2020.1.16-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From daa343031e505228d30ed85c84efcf5691a9f664 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 10:23:08 +0000 Subject: [PATCH 78/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 6af6dd5..6a4c894 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: 2020.1.16 -Release: 9%{?dist} +Release: 10%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 2020.1.16-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 2020.1.16-9 - Rebuilt for Python 3.12 From b497dda37aefb7fa176e4a6a8165ab9585ef2d7e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 22 Oct 2023 21:41:00 -0400 Subject: [PATCH 79/95] Fix flatpak build No assumptions should be made as to the location of help2man; in the case of flatpak builds, the buildroot version in /usr is used even when building into /app. --- python-html2text.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 6a4c894..5899514 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -50,7 +50,7 @@ Obsoletes: python2-%{upname} <= %{version}-%{release} %py3_install %{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/python3-%{upname} export PYTHONPATH="%{buildroot}%{python3_sitelib}" -%{_bindir}/help2man --no-discard-stderr -s 1 -N -o %{buildroot}%{_mandir}/man1/python3-%{upname}.1 %{buildroot}%{_bindir}/python3-%{upname} +help2man --no-discard-stderr -s 1 -N -o %{buildroot}%{_mandir}/man1/python3-%{upname}.1 %{buildroot}%{_bindir}/python3-%{upname} pushd %{buildroot}%{_bindir} ln -s python3-%{upname} %{upname} ln -s python3-%{upname} %{name} From 7ed9b89423e4bd34ec95b98510435262a883aa63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 02:16:15 +0000 Subject: [PATCH 80/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 5899514..b4a35c3 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: 2020.1.16 -Release: 10%{?dist} +Release: 11%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2020.1.16-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 2020.1.16-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From bee06a11604ea9ad7766db0fe598dee2efb04663 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 05:13:46 +0000 Subject: [PATCH 81/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index b4a35c3..19f608f 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: 2020.1.16 -Release: 11%{?dist} +Release: 12%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 2020.1.16-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2020.1.16-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1d1e4bd2fe819aa932d9834f5316bd99841b150e Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sun, 25 Feb 2024 18:59:48 +0100 Subject: [PATCH 82/95] update to v2024.2.25 --- .gitignore | 1 + python-html2text.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9351604..5dbfdbe 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ html2text-2.38.py /html2text-2019.8.11.tar.gz /html2text-2019.9.26.tar.gz /html2text-2020.1.16.tar.gz +/html2text-2024.2.25.tar.gz diff --git a/python-html2text.spec b/python-html2text.spec index 19f608f..3de93aa 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -6,8 +6,8 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} -Version: 2020.1.16 -Release: 12%{?dist} +Version: 2024.2.25 +Release: 1%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Sun Feb 25 2024 Fedora Release Monitoring - 2024.2.25-1 +- Update to 2024.2.25 (#2265896) + * Fri Jan 26 2024 Fedora Release Engineering - 2020.1.16-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index bb8e7f3..587b5e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (html2text-2020.1.16.tar.gz) = 14453c98e81d05afb3241b04a9e50caf63e4b6f857337b4bd9f53e6b8fa7146aa6a1f4f64777db9fa350316b19fe62a0033dce5748191ca9fbd17a8757002855 +SHA512 (html2text-2024.2.25.tar.gz) = 9adf1367b644a7dccef35ddd0041ade8a206943927585a4c1766ff76e2ffc9ab58479d285fe8eb2e18b80270f9eb50ec82855fb8b0df8525e905278abd8ddc22 From a3c804de7766837585707ee132fdf31b656bc6e0 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Tue, 27 Feb 2024 21:40:49 +0100 Subject: [PATCH 83/95] bugfix update --- .gitignore | 1 + python-html2text.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5dbfdbe..76ccc63 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ html2text-2.38.py /html2text-2019.9.26.tar.gz /html2text-2020.1.16.tar.gz /html2text-2024.2.25.tar.gz +/html2text-2024.2.26.tar.gz diff --git a/python-html2text.spec b/python-html2text.spec index 3de93aa..2a3ea0a 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -6,7 +6,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} -Version: 2024.2.25 +Version: 2024.2.26 Release: 1%{?dist} Summary: %{common_sum} @@ -79,6 +79,9 @@ popd %changelog +* Tue Feb 27 2024 Fedora Release Monitoring - 2024.2.26-1 +- Update to 2024.2.26 (#2266431) + * Sun Feb 25 2024 Fedora Release Monitoring - 2024.2.25-1 - Update to 2024.2.25 (#2265896) diff --git a/sources b/sources index 587b5e6..c2e523f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (html2text-2024.2.25.tar.gz) = 9adf1367b644a7dccef35ddd0041ade8a206943927585a4c1766ff76e2ffc9ab58479d285fe8eb2e18b80270f9eb50ec82855fb8b0df8525e905278abd8ddc22 +SHA512 (html2text-2024.2.26.tar.gz) = 8304dbc0a8d06ea1bbed4edccbbcb817423bab7acbaa9db84c6c9c3e74a8d1daec148cb591b76b7d5865224ea424b388316c867bda4b07b19ed91272b7beff88 From d77422967fc588d712c877e5468a39cc21bfc3d2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 10:52:23 +0200 Subject: [PATCH 84/95] Rebuilt for Python 3.13 --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 2a3ea0a..0800088 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: 2024.2.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Fri Jun 07 2024 Python Maint - 2024.2.26-2 +- Rebuilt for Python 3.13 + * Tue Feb 27 2024 Fedora Release Monitoring - 2024.2.26-1 - Update to 2024.2.26 (#2266431) From 8b1f1dee9494063b1d507722ad561ab3cbba77dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 12:10:17 +0000 Subject: [PATCH 85/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 0800088..381cd9a 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: 2024.2.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_sum} License: GPLv3 @@ -79,6 +79,9 @@ popd %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 2024.2.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 2024.2.26-2 - Rebuilt for Python 3.13 From 0bd0c3bf282c54b2a84b546a84c75819b49e0f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 14:23:19 +0200 Subject: [PATCH 86/95] convert GPLv3 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- python-html2text.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index 381cd9a..f60b47f 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -7,10 +7,11 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2024.2.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_sum} -License: GPLv3 +# Automatically converted from old format: GPLv3 - review is highly recommended. +License: GPL-3.0-only URL: http://alir3z4.github.io/%{upname} Source0: https://files.pythonhosted.org/packages/source/h/%{upname}/%{upname}-%{version}.tar.gz @@ -79,6 +80,9 @@ popd %changelog +* Mon Jul 29 2024 Miroslav Suchý - 2024.2.26-4 +- convert license to SPDX + * Fri Jul 19 2024 Fedora Release Engineering - 2024.2.26-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f501b0840bd1aebfbd4211551d6a129ca6aec7fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 14:59:41 +0000 Subject: [PATCH 87/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index f60b47f..c6e6528 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: 2024.2.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_sum} # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -80,6 +80,9 @@ popd %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 2024.2.26-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jul 29 2024 Miroslav Suchý - 2024.2.26-4 - convert license to SPDX From c7224efcec35b985d36e4cfcf01162514a3528f8 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Wed, 21 May 2025 00:00:27 +0200 Subject: [PATCH 88/95] update to v2025.4.15 --- .gitignore | 1 + python-html2text.spec | 24 ++++++++++++++---------- sources | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 76ccc63..3ea4577 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ html2text-2.38.py /html2text-2020.1.16.tar.gz /html2text-2024.2.25.tar.gz /html2text-2024.2.26.tar.gz +/html2text-2025.4.15.tar.gz diff --git a/python-html2text.spec b/python-html2text.spec index c6e6528..3e39c79 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -6,13 +6,12 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} -Version: 2024.2.26 -Release: 5%{?dist} +Version: 2025.4.15 +Release: 1%{?dist} Summary: %{common_sum} -# Automatically converted from old format: GPLv3 - review is highly recommended. License: GPL-3.0-only -URL: http://alir3z4.github.io/%{upname} +URL: https://github.com/Alir3z4/%{upname}/ Source0: https://files.pythonhosted.org/packages/source/h/%{upname}/%{upname}-%{version}.tar.gz BuildArch: noarch @@ -38,17 +37,22 @@ Obsoletes: python2-%{upname} <= %{version}-%{release} %prep %autosetup -n %{upname}-%{version} -%{__rm} -fr *.egg-info +#%{__rm} -fr *.egg-info + +%generate_buildrequires +%pyproject_buildrequires %build -%py3_build +%pyproject_wheel %install +%pyproject_install +%pyproject_save_files html2text + %{__mkdir} -p %{buildroot}%{_mandir}/man1 -%py3_install %{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/python3-%{upname} export PYTHONPATH="%{buildroot}%{python3_sitelib}" help2man --no-discard-stderr -s 1 -N -o %{buildroot}%{_mandir}/man1/python3-%{upname}.1 %{buildroot}%{_bindir}/python3-%{upname} @@ -63,10 +67,12 @@ popd %check +%pyproject_check_import %{__python3} -m pytest +%pytest %{_builddir} -%files -n python3-%{upname} +%files -n python3-%{upname} -f %{pyproject_files} %license AUTHORS.* COPYING %doc README.* ChangeLog.* PKG-INFO %{_bindir}/python3-%{upname} @@ -75,8 +81,6 @@ popd %{_mandir}/man1/python3-%{upname}.1* %{_mandir}/man1/%{upname}.1* %{_mandir}/man1/%{name}.1* -%{python3_sitelib}/%{upname} -%{python3_sitelib}/%{upname}-%{version}-py%{python3_version}.egg-info %changelog diff --git a/sources b/sources index c2e523f..03c28dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (html2text-2024.2.26.tar.gz) = 8304dbc0a8d06ea1bbed4edccbbcb817423bab7acbaa9db84c6c9c3e74a8d1daec148cb591b76b7d5865224ea424b388316c867bda4b07b19ed91272b7beff88 +SHA512 (html2text-2025.4.15.tar.gz) = 2f12e293bb8aa87b4d03d3ec4698e8e8bf013acc9f69b25a2c7a1aacca9a8aaf646747c56a47bc15dae0601ecdc119ba4818daca933d4be7fa52f234c672d9f3 From 4925990bc967ca8156006701018e48a90a8fb134 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Wed, 21 May 2025 00:24:02 +0200 Subject: [PATCH 89/95] fix license --- python-html2text.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 3e39c79..df7b73a 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -10,7 +10,7 @@ Version: 2025.4.15 Release: 1%{?dist} Summary: %{common_sum} -License: GPL-3.0-only +License: GPL-3.0-or-later URL: https://github.com/Alir3z4/%{upname}/ Source0: https://files.pythonhosted.org/packages/source/h/%{upname}/%{upname}-%{version}.tar.gz From a87babb75b5b6b16e05b82ec780f752646430a40 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Wed, 21 May 2025 00:33:12 +0200 Subject: [PATCH 90/95] cleanup --- python-html2text.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index df7b73a..a71a6f8 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -37,7 +37,6 @@ Obsoletes: python2-%{upname} <= %{version}-%{release} %prep %autosetup -n %{upname}-%{version} -#%{__rm} -fr *.egg-info %generate_buildrequires %pyproject_buildrequires From 2d7afc8619ef9bf9bc3bf9db3d15344844169dd8 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Wed, 21 May 2025 01:08:13 +0200 Subject: [PATCH 91/95] catch up changelog --- python-html2text.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python-html2text.spec b/python-html2text.spec index a71a6f8..9275138 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -83,6 +83,9 @@ popd %changelog +* Wed May 21 2025 David Kaufmann - 2025.4.15-1 +- Update to 2025.4.15 + * Sat Jan 18 2025 Fedora Release Engineering - 2024.2.26-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From acb38288261db47577f04abf74218e3d43e364e9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 22:47:44 +0200 Subject: [PATCH 92/95] Rebuilt for Python 3.14 --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 9275138..15b597f 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: 2025.4.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_sum} License: GPL-3.0-or-later @@ -83,6 +83,9 @@ popd %changelog +* Mon Jun 02 2025 Python Maint - 2025.4.15-2 +- Rebuilt for Python 3.14 + * Wed May 21 2025 David Kaufmann - 2025.4.15-1 - Update to 2025.4.15 From 8c8381846ee5cfa32e045d8a1b146e2fa9a67d87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 08:15:28 +0000 Subject: [PATCH 93/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 15b597f..6942134 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: 2025.4.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_sum} License: GPL-3.0-or-later @@ -83,6 +83,9 @@ popd %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2025.4.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 2025.4.15-2 - Rebuilt for Python 3.14 From afe6eb6fa8e97d21c48f449f759691ce2f4f7d46 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:52:44 +0200 Subject: [PATCH 94/95] Rebuilt for Python 3.14.0rc2 bytecode --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 6942134..090b388 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: 2025.4.15 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_sum} License: GPL-3.0-or-later @@ -83,6 +83,9 @@ popd %changelog +* Fri Aug 15 2025 Python Maint - 2025.4.15-4 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 2025.4.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From daa7120b41ad7712a47d96260fda0a16d60ce331 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 13:26:07 +0200 Subject: [PATCH 95/95] Rebuilt for Python 3.14.0rc3 bytecode --- python-html2text.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index 090b388..45f9598 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: 2025.4.15 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_sum} License: GPL-3.0-or-later @@ -83,6 +83,9 @@ popd %changelog +* Fri Sep 19 2025 Python Maint - 2025.4.15-5 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 2025.4.15-4 - Rebuilt for Python 3.14.0rc2 bytecode