From fbb366b069d40a7f3397ba76d41b5556545c6982027090b7be4eb8fc77cd4676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Wed, 28 May 2025 06:41:46 +0000 Subject: [PATCH 1/4] Accepting request 1280690 from home:mcalabkova:branches:devel:languages:python - Convert to pip-based build OBS-URL: https://build.opensuse.org/request/show/1280690 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-html2text?expand=0&rev=44 --- python-html2text.changes | 5 +++++ python-html2text.spec | 19 +++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/python-html2text.changes b/python-html2text.changes index f438131..84e4eea 100644 --- a/python-html2text.changes +++ b/python-html2text.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 27 16:19:15 UTC 2025 - Markéta Machová + +- Convert to pip-based build + ------------------------------------------------------------------- Tue Mar 19 07:01:27 UTC 2024 - Dirk Müller diff --git a/python-html2text.spec b/python-html2text.spec index 1163811..990d8ca 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -1,7 +1,7 @@ # # spec file for package python-html2text # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,6 @@ %define upname html2text -%define skip_python2 1 %{?sle15_python_module_pythons} Name: python-%{upname} Version: 2024.2.26 @@ -27,12 +26,14 @@ License: GPL-3.0-only Group: Development/Languages/Python URL: https://github.com/Alir3z4/html2text/ Source: https://files.pythonhosted.org/packages/source/h/%{upname}/%{upname}-%{version}.tar.gz +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires(post): update-alternatives -Requires(preun): update-alternatives +Requires(post): alts +Requires(preun): alts Provides: html2text = %{version}-%{release} Obsoletes: html2text < %{version}-%{release} BuildArch: noarch @@ -51,10 +52,10 @@ sed -i '/^#!/d' %{upname}/__init__.py rm -r *.egg-info/ %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/%{upname} @@ -66,15 +67,13 @@ rm -r *.egg-info/ %python_uninstall_alternative html2text %check -# otherwise python 3.6 does not automatically select UTF-8 for console output -export LANG=en_US.UTF-8 %pytest %files %{python_files} %license COPYING %doc README.md AUTHORS.rst ChangeLog.rst %python_alternative %{_bindir}/%{upname} -%{python_sitelib}/* -%{python_sitelib}/*.egg-info/ +%{python_sitelib}/html2text +%{python_sitelib}/html2text-%{version}*-info %changelog From e1feb59fa7c25f1618c8269ff0d999517f78738408b19d064abbf0756e208dbe Mon Sep 17 00:00:00 2001 From: Nico Krapp Date: Wed, 4 Jun 2025 13:11:04 +0000 Subject: [PATCH 2/4] - fix usage of libalternatives OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-html2text?expand=0&rev=45 --- python-html2text.changes | 5 +++++ python-html2text.spec | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/python-html2text.changes b/python-html2text.changes index 84e4eea..18b96c6 100644 --- a/python-html2text.changes +++ b/python-html2text.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 4 13:09:18 UTC 2025 - Nico Krapp + +- fix usage of libalternatives + ------------------------------------------------------------------- Tue May 27 16:19:15 UTC 2025 - Markéta Machová diff --git a/python-html2text.spec b/python-html2text.spec index 990d8ca..ef9ea23 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -16,6 +16,7 @@ # +%bcond_without libalternatives %define upname html2text %{?sle15_python_module_pythons} Name: python-%{upname} @@ -30,10 +31,10 @@ BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} +BuildRequires: alts BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires(post): alts -Requires(preun): alts +Requires: alts Provides: html2text = %{version}-%{release} Obsoletes: html2text < %{version}-%{release} BuildArch: noarch @@ -60,11 +61,11 @@ rm -r *.egg-info/ %python_clone -a %{buildroot}%{_bindir}/%{upname} -%post -%python_install_alternative html2text +%pre +# Removing old update-alternatives entries. +%python_libalternatives_reset_alternative -%postun -%python_uninstall_alternative html2text +# post and postun macro call is not needed with only libalternatives %check %pytest From 1ea0c7a4d2c26610becdd06a24f085809c2382a1e9b08123855a253ba01194c2 Mon Sep 17 00:00:00 2001 From: Nico Krapp Date: Wed, 4 Jun 2025 14:15:11 +0000 Subject: [PATCH 3/4] fix name in pre section OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-html2text?expand=0&rev=46 --- python-html2text.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-html2text.spec b/python-html2text.spec index ef9ea23..be8139c 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -63,7 +63,7 @@ rm -r *.egg-info/ %pre # Removing old update-alternatives entries. -%python_libalternatives_reset_alternative +%python_libalternatives_reset_alternative html2text # post and postun macro call is not needed with only libalternatives From 4d41ea6fb48014068864c2f2825aec98ef4e6312e0b1eab40f68621a1cc2f8b3 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Mon, 7 Jul 2025 02:19:39 +0000 Subject: [PATCH 4/4] - Update to 2025.4.15: * Upgrade Build Tools to Lates * Support tri-backquote style code block and fix ordered list indent * Fix invalid character reference parsing - Correct parsing error in changes file. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-html2text?expand=0&rev=47 --- html2text-2024.2.26.tar.gz | 3 --- html2text-2025.4.15.tar.gz | 3 +++ python-html2text.changes | 10 +++++++++- python-html2text.spec | 6 +++--- 4 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 html2text-2024.2.26.tar.gz create mode 100644 html2text-2025.4.15.tar.gz diff --git a/html2text-2024.2.26.tar.gz b/html2text-2024.2.26.tar.gz deleted file mode 100644 index fee6f98..0000000 --- a/html2text-2024.2.26.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05f8e367d15aaabc96415376776cdd11afd5127a77fce6e36afc60c563ca2c32 -size 56527 diff --git a/html2text-2025.4.15.tar.gz b/html2text-2025.4.15.tar.gz new file mode 100644 index 0000000..0f2895a --- /dev/null +++ b/html2text-2025.4.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:948a645f8f0bc3abe7fd587019a2197a12436cd73d0d4908af95bfc8da337588 +size 64316 diff --git a/python-html2text.changes b/python-html2text.changes index 18b96c6..3ecf84b 100644 --- a/python-html2text.changes +++ b/python-html2text.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jul 7 02:18:35 UTC 2025 - Steve Kowalik + +- Update to 2025.4.15: + * Upgrade Build Tools to Lates + * Support tri-backquote style code block and fix ordered list indent + * Fix invalid character reference parsing +- Correct parsing error in changes file. + ------------------------------------------------------------------- Wed Jun 4 13:09:18 UTC 2025 - Nico Krapp @@ -343,7 +352,6 @@ Wed Sep 21 09:28:46 UTC 2011 - saschpe@suse.de - Fixed non-executable script rpmlint warning ------------------------------------------------------------------- - Tue Feb 15 23:33:53 UTC 2011 - alexandre@exatati.com.br - Update to 3.01. diff --git a/python-html2text.spec b/python-html2text.spec index be8139c..587aca2 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -20,15 +20,15 @@ %define upname html2text %{?sle15_python_module_pythons} Name: python-%{upname} -Version: 2024.2.26 +Version: 2025.4.15 Release: 0 Summary: Python script for turning HTML into Markdown text License: GPL-3.0-only -Group: Development/Languages/Python URL: https://github.com/Alir3z4/html2text/ Source: https://files.pythonhosted.org/packages/source/h/%{upname}/%{upname}-%{version}.tar.gz BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: alts @@ -75,6 +75,6 @@ rm -r *.egg-info/ %doc README.md AUTHORS.rst ChangeLog.rst %python_alternative %{_bindir}/%{upname} %{python_sitelib}/html2text -%{python_sitelib}/html2text-%{version}*-info +%{python_sitelib}/html2text-%{version}.dist-info %changelog