diff --git a/.gitignore b/.gitignore index 78be7e2..e402717 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/argparse_manpage-*.tar.gz +/argparse-manpage-*.tar.gz diff --git a/argparse-manpage.spec b/argparse-manpage.spec index 7d88f6f..cf2b71a 100644 --- a/argparse-manpage.spec +++ b/argparse-manpage.spec @@ -1,6 +1,4 @@ -%global pip_module_name argparse_manpage - -%if 0%{?fedora} || 0%{?rhel} >= 9 +%if 0%{?fedora} %bcond_without pyproject %bcond_with python2 %bcond_with python3 @@ -29,19 +27,17 @@ There is a limited support for (deprecated) optparse objects, too. Name: argparse-manpage -Version: 4.7 -Release: 5%{?dist} +Version: 3 +Release: 1%{?dist} Summary: %{sum Python} BuildArch: noarch -License: Apache-2.0 +License: ASL 2.0 URL: https://github.com/praiskup/%{name} -Source0: %pypi_source %pip_module_name +Source0: https://github.com/praiskup/%name/releases/download/v%version/%name-%version.tar.gz %if %{with python2} BuildRequires: python2-setuptools python2-devel -BuildRequires: python2-packaging -BuildRequires: python2-toml %if %{with check} %if 0%{?rhel} && 0%{?rhel} == 7 BuildRequires: pytest @@ -53,8 +49,6 @@ BuildRequires: python2-pytest %if %{with python3} BuildRequires: python3-setuptools python3-devel -BuildRequires: python3-packaging -BuildRequires: python3-tomli %if %{with check} BuildRequires: python3-pytest %endif @@ -62,8 +56,6 @@ BuildRequires: python3-pytest %if %{with pyproject} BuildRequires: python3-devel -# EL9 needs this explicitly -BuildRequires: pyproject-rpm-macros %if %{with check} BuildRequires: python3-pytest %endif @@ -81,8 +73,6 @@ Requires: python2-%name = %version-%release %package -n python2-%name Summary: %{sum Python 2} -Requires: python2-setuptools -Requires: python2-toml %description -n python2-%name %{desc} @@ -90,21 +80,13 @@ Requires: python2-toml %package -n python3-%name Summary: %{sum Python 3} -%if %{without pyproject} -Requires: python3-setuptools -%endif %description -n python3-%name %{desc} -%if %{with pyproject} -%pyproject_extras_subpkg -n python3-%{name} setuptools -%endif - - %prep -%setup -q -n %{pip_module_name}-%{version} +%setup -q %if %{with pyproject} %generate_buildrequires @@ -139,10 +121,6 @@ Requires: python3-setuptools %if %{with check} %check -# Disable pip build isolation to make the tests work in offline environment -# Fixes https://bugzilla.redhat.com/2417959 -export PIP_NO_BUILD_ISOLATION=0 - %if %{with python2} PYTHONPATH=%buildroot%python2_sitearch %__python2 -m pytest -vv %endif @@ -150,7 +128,7 @@ PYTHONPATH=%buildroot%python2_sitearch %__python2 -m pytest -vv PYTHONPATH=%buildroot%python3_sitearch %__python3 -m pytest -vv %endif %if %{with pyproject} -%pytest -vv +%pytest %endif %endif @@ -160,9 +138,9 @@ PYTHONPATH=%buildroot%python3_sitearch %__python3 -m pytest -vv %{_bindir}/argparse-manpage %_mandir/man1/argparse-manpage.1.* %if %{with python3} || %{with pyproject} -%python3_sitelib/argparse_manpage/cli.py +%python3_sitelib/build_manpages/cli.py %else -%python2_sitelib/argparse_manpage/cli.py +%python2_sitelib/build_manpages/cli.py %endif @@ -170,9 +148,8 @@ PYTHONPATH=%buildroot%python3_sitearch %__python3 -m pytest -vv %files -n python2-%name %license LICENSE %python2_sitelib/build_manpages -%python2_sitelib/argparse_manpage %python2_sitelib/argparse_manpage-%{version}*.egg-info -%exclude %python2_sitelib/argparse_manpages/cli.py +%exclude %python2_sitelib/build_manpages/cli.py %endif @@ -180,101 +157,16 @@ PYTHONPATH=%buildroot%python3_sitearch %__python3 -m pytest -vv %files -n python3-%name %license LICENSE %python3_sitelib/build_manpages -%python3_sitelib/argparse_manpage %if %{with pyproject} %python3_sitelib/argparse_manpage-*dist-info %else %python3_sitelib/argparse_manpage-%{version}*.egg-info %endif -%exclude %python3_sitelib/argparse_manpage/cli.py +%exclude %python3_sitelib/build_manpages/cli.py %endif %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 4.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Mon Dec 01 2025 Miro Hrončok - 4.7-4 -- Fix build with pip 25.3+ -- Fixes: rhbz#2417959 - -* Fri Sep 19 2025 Python Maint - 4.7-3 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 4.7-2 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Fri Aug 15 2025 Pavel Raiskup - 4.7-1 -- new upstream release: https://github.com/praiskup/argparse-manpage/releases/tag/v4.7 - -* Wed Jul 23 2025 Fedora Release Engineering - 4.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 02 2025 Python Maint - 4.6-6 -- Rebuilt for Python 3.14 - -* Thu Apr 03 2025 Lumír Balhar - 4.6-5 -- Fix build with newer setuptools - -* Thu Jan 16 2025 Fedora Release Engineering - 4.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 4.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 4.6-2 -- Rebuilt for Python 3.13 - -* Wed Jun 05 2024 Pavel Raiskup - 4.6-1 -- new upstream release (rhbz#2279987) - -* Mon Jan 22 2024 Fedora Release Engineering - 4.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 4.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 22 2023 Pavel Raiskup - 4.5-1 -- new upstream release https://github.com/praiskup/argparse-manpage/releases/tag/v4.4 - -* Mon Sep 04 2023 Pavel Raiskup - 4.4-1 -- new upstream release: https://github.com/praiskup/argparse-manpage/releases/tag/v4.4 -- license tag in SPDX format - -* Wed Jul 19 2023 Fedora Release Engineering - 4.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 4.3-2 -- Rebuilt for Python 3.12 - -* Thu May 18 2023 Pavel Raiskup - 4.3-1 -- new upstream release, tomli dep instead of toml - https://github.com/praiskup/argparse-manpage/releases/tag/v4.3 - -* Sun May 14 2023 Pavel Raiskup - 4.2-1 -- new upstream release, upport for pyproject.toml specs, and --manfile option - -* Sat Apr 15 2023 Pavel Raiskup - 4.1-1 -- new `--include` feature, inspired by `help2man --include` -- allow overriding build date with SOURCE_DATE_EPOCH environment variable -- the AUTHORS section was changed to more standard AUTHOR - -* Wed Jan 18 2023 Fedora Release Engineering - 4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Oct 31 2022 Pavel Raiskup - 4-1 -- new upstream release: - https://github.com/praiskup/argparse-manpage/releases/tag/v4 - -* Fri Jul 22 2022 Charalampos Stratakis - 3-4 -- Fix tests compatibility with pip >= 21.3 - -* Wed Jul 20 2022 Fedora Release Engineering - 3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 3-2 -- Rebuilt for Python 3.11 - * Wed Apr 27 2022 Pavel Raiskup - 3-1 - new upstream release: https://github.com/praiskup/argparse-manpage/releases/tag/v3 diff --git a/build-and-update-all-branches b/build-and-update-all-branches index dd74154..d014607 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -4,7 +4,7 @@ # script. main=main -branches="$main epel8 epel9 epel10 epel10.0 f41 f42 f43" +branches="$main epel7 epel8 epel9 f34 f35 f36" exit_handler () { diff --git a/sources b/sources index e28ee18..98485d3 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (argparse_manpage-4.7.tar.gz) = 88c2e0e0747f5950b131d5456b1bc153e64d11ca41d87e3c995d91f7ffb662685a5c58f7ea99f011151aa72e45a5bcab98ac6729e20a19d086a7798d9c783452 +SHA512 (argparse-manpage-2.2.tar.gz) = 39bb51687dd8359930527b2492469166de7654ea12e456c5ea5b78a7293cb4e792307706b9a9e0280373ce4ea18a2a0bf16bd6b739508634e93fde284033bf13 +SHA512 (argparse-manpage-3.tar.gz) = 8bddfc91396ee6c9594baa21126fb3128ebabb8fb96dba1461e0631e0e3070677973b709d998dcea26e31b6d11a9f37a8b37005bb78f7769d45a29be3186a088