From bf8d9dd1c2c683101a49f8de29a73c4b08edf9d2 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Wed, 3 Apr 2019 15:23:01 -0400 Subject: [PATCH 01/19] initial spec file --- .gitignore | 1 + python-jaraco-packaging.spec | 83 ++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 85 insertions(+) create mode 100644 .gitignore create mode 100644 python-jaraco-packaging.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2d2c638 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/jaraco.packaging-6.1.tar.gz diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec new file mode 100644 index 0000000..badb53f --- /dev/null +++ b/python-jaraco-packaging.spec @@ -0,0 +1,83 @@ +# Created by pyp2rpm-3.2.2 +%global pypi_name jaraco.packaging +%global pkg_name jaraco-packaging +# This package is interdependant on rst-linker to build docs +# will build both with out docs and add docs in later +%global with_docs 0 + +Name: python-%{pkg_name} +Version: 6.1 +Release: 1%{?dist} +Summary: Tools to supplement packaging Python releases + +License: MIT +URL: https://github.com/jaraco/jaraco.packaging +Source0: https://files.pythonhosted.org/packages/source/j/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +BuildArch: noarch + +Requires: python3-rst-linker +Requires: python3-six >= 1.4 +Requires: python3-setuptools + +BuildRequires: python3-devel +BuildRequires: python3-setuptools_scm >= 1.15.0 +BuildRequires: python3-setuptools +BuildRequires: python3-six >= 1.4 + +%if 0%{?with_docs} +BuildRequires: python3-sphinx +BuildRequires: python3-rst-linker +%endif + +%description + Tools for packaging.dependency_tree A dist-utils command for reporting the +dependency tree as resolved by setup-tools. Use after installing a package.show +A dist-utils command for reporting the attributes of a distribution, such as the +version or author name. + +%if 0%{?with_docs} +%package -n python-%{pkg_name}-doc +Summary: jaraco.packaging documentation +%description -n python-%{pkg_name}-doc +Documentation for jaraco.packaging +%endif + +%prep +%autosetup -n %{pypi_name}-%{version} +# Remove bundled egg-info +rm -rf %{pypi_name}.egg-info + +%build +%py3_build +%if 0%{?with_docs} +# generate html docs +# This package requires itself to build docs :/ +PYTHONPATH=./ sphinx-build docs html +# remove the sphinx-build leftovers +rm -rf html/.{doctrees,buildinfo} +%endif + +%install +%py3_install + +%check +%{__python3} setup.py test + +%files -n python-%{pkg_name} +%license LICENSE +%doc README.rst +%{_bindir}/upload-package +%{_bindir}/upload-package +%{_bindir}/dependency-tree +%{python3_sitelib}/jaraco +%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info + +%if 0%{?with_docs} +%files -n python-%{pkg_name}-doc +%license LICENSE +%doc html +%endif + +%changelog +* Tue Apr 02 2019 Dan Radez - 6.1-1 +- Initial package. diff --git a/sources b/sources new file mode 100644 index 0000000..36ff3d3 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (jaraco.packaging-6.1.tar.gz) = a84c71bd880879f172e6527987e9ffa681da28803112a0195fb21153cb6cd1b3d5c00a6d21c562d7c5542349f335bea4a349fd22662f22dd7bf9bef7b6b0f7d8 From 0d50cbb78d344f176085c766e870443e784c38b8 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Fri, 5 Apr 2019 11:00:57 -0400 Subject: [PATCH 02/19] adding py3 subpackage --- python-jaraco-packaging.spec | 43 +++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index badb53f..ee643da 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -3,11 +3,11 @@ %global pkg_name jaraco-packaging # This package is interdependant on rst-linker to build docs # will build both with out docs and add docs in later -%global with_docs 0 +%bcond_with docs Name: python-%{pkg_name} Version: 6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -15,27 +15,32 @@ URL: https://github.com/jaraco/jaraco.packaging Source0: https://files.pythonhosted.org/packages/source/j/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch -Requires: python3-rst-linker -Requires: python3-six >= 1.4 -Requires: python3-setuptools +%description + Tools for packaging.dependency_tree A dist-utils command for reporting the +dependency tree as resolved by setup-tools. Use after installing a package.show +A dist-utils command for reporting the attributes of a distribution, such as the +version or author name. +%package -n python3-%{pkg_name} +Summary: %{summary} +BuildRequires: python3-devel BuildRequires: python3-devel -BuildRequires: python3-setuptools_scm >= 1.15.0 BuildRequires: python3-setuptools +BuildRequires: python3-setuptools_scm >= 1.15.0 BuildRequires: python3-six >= 1.4 +%{?python_provide:%python_provide python3-%{pkg_name}} + +%description -n python3-%{pkg_name} +%{description} -%if 0%{?with_docs} +Requires: python3-rst-linker +Requires: python3-six >= 1.4 +Requires: python3-setuptools + +%if %{with docs} BuildRequires: python3-sphinx BuildRequires: python3-rst-linker -%endif - -%description - Tools for packaging.dependency_tree A dist-utils command for reporting the -dependency tree as resolved by setup-tools. Use after installing a package.show -A dist-utils command for reporting the attributes of a distribution, such as the -version or author name. -%if 0%{?with_docs} %package -n python-%{pkg_name}-doc Summary: jaraco.packaging documentation %description -n python-%{pkg_name}-doc @@ -49,7 +54,7 @@ rm -rf %{pypi_name}.egg-info %build %py3_build -%if 0%{?with_docs} +%if %{with docs} # generate html docs # This package requires itself to build docs :/ PYTHONPATH=./ sphinx-build docs html @@ -63,7 +68,7 @@ rm -rf html/.{doctrees,buildinfo} %check %{__python3} setup.py test -%files -n python-%{pkg_name} +%files -n python3-%{pkg_name} %license LICENSE %doc README.rst %{_bindir}/upload-package @@ -72,12 +77,14 @@ rm -rf html/.{doctrees,buildinfo} %{python3_sitelib}/jaraco %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info -%if 0%{?with_docs} +%if %{with docs} %files -n python-%{pkg_name}-doc %license LICENSE %doc html %endif %changelog +* Fri Apr 05 2019 Dan Radez - 6.1-2 +- adding py3 subpackage. * Tue Apr 02 2019 Dan Radez - 6.1-1 - Initial package. From 28874d9f7af9b985bac7d122ff24cae4fb42e8cb Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Fri, 5 Apr 2019 11:27:37 -0400 Subject: [PATCH 03/19] adding python3dist() --- python-jaraco-packaging.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index ee643da..1348127 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -24,22 +24,21 @@ version or author name. %package -n python3-%{pkg_name} Summary: %{summary} BuildRequires: python3-devel -BuildRequires: python3-devel -BuildRequires: python3-setuptools +BuildRequires: python3dist(setuptools) BuildRequires: python3-setuptools_scm >= 1.15.0 -BuildRequires: python3-six >= 1.4 +BuildRequires: python3dist(six) >= 1.4 %{?python_provide:%python_provide python3-%{pkg_name}} %description -n python3-%{pkg_name} %{description} -Requires: python3-rst-linker -Requires: python3-six >= 1.4 -Requires: python3-setuptools +Requires: python3dist(rst-linker) +Requires: python3dist(six) >= 1.4 +Requires: python3dist(setuptools) %if %{with docs} -BuildRequires: python3-sphinx -BuildRequires: python3-rst-linker +BuildRequires: python3dist(sphinx) +BuildRequires: python3dist(rst-linker) %package -n python-%{pkg_name}-doc Summary: jaraco.packaging documentation From cf764ec0831e23276891cf03fcda408f597b6fab Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Fri, 5 Apr 2019 15:09:28 -0400 Subject: [PATCH 04/19] adding a python3-jaraco subpackage --- python-jaraco-packaging.spec | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index 1348127..ba7f9ac 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -7,7 +7,7 @@ Name: python-%{pkg_name} Version: 6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -21,9 +21,17 @@ dependency tree as resolved by setup-tools. Use after installing a package.show A dist-utils command for reporting the attributes of a distribution, such as the version or author name. +%package -n python3-jaraco +Summary: A Parent package for jaraco's parent dir and init file. +BuildRequires: python3-devel +%{?python_provide:%python_provide python3-jaraco} + +%description -n python3-jaraco +A Parent package for jaraco's parent dir and init file. + %package -n python3-%{pkg_name} Summary: %{summary} -BuildRequires: python3-devel +#BuildRequires: python3-devel BuildRequires: python3dist(setuptools) BuildRequires: python3-setuptools_scm >= 1.15.0 BuildRequires: python3dist(six) >= 1.4 @@ -33,6 +41,7 @@ BuildRequires: python3dist(six) >= 1.4 %{description} Requires: python3dist(rst-linker) +Requires: python3dist(jaraco) Requires: python3dist(six) >= 1.4 Requires: python3dist(setuptools) @@ -67,13 +76,18 @@ rm -rf html/.{doctrees,buildinfo} %check %{__python3} setup.py test +%files -n python3-jaraco +%license LICENSE +%doc README.rst +%{python3_sitelib}/jaraco +%exclude %{python3_sitelib}/jaraco/packaging + %files -n python3-%{pkg_name} %license LICENSE %doc README.rst %{_bindir}/upload-package -%{_bindir}/upload-package %{_bindir}/dependency-tree -%{python3_sitelib}/jaraco +%{python3_sitelib}/jaraco/packaging %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %if %{with docs} @@ -83,6 +97,8 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog +* Fri Apr 05 2019 Dan Radez - 6.1-3 +- adding python-jaraco subpackage. * Fri Apr 05 2019 Dan Radez - 6.1-2 - adding py3 subpackage. * Tue Apr 02 2019 Dan Radez - 6.1-1 From 4d0c91a546b4729a9021d780b497880cc97610bb Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Fri, 5 Apr 2019 15:20:44 -0400 Subject: [PATCH 05/19] fixing packaging requires --- python-jaraco-packaging.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index ba7f9ac..807f2b4 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -7,7 +7,7 @@ Name: python-%{pkg_name} Version: 6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -31,7 +31,11 @@ A Parent package for jaraco's parent dir and init file. %package -n python3-%{pkg_name} Summary: %{summary} -#BuildRequires: python3-devel +Requires: python3dist(jaraco) +Requires: python3dist(rst-linker) +Requires: python3dist(six) >= 1.4 +Requires: python3dist(setuptools) + BuildRequires: python3dist(setuptools) BuildRequires: python3-setuptools_scm >= 1.15.0 BuildRequires: python3dist(six) >= 1.4 @@ -40,11 +44,6 @@ BuildRequires: python3dist(six) >= 1.4 %description -n python3-%{pkg_name} %{description} -Requires: python3dist(rst-linker) -Requires: python3dist(jaraco) -Requires: python3dist(six) >= 1.4 -Requires: python3dist(setuptools) - %if %{with docs} BuildRequires: python3dist(sphinx) BuildRequires: python3dist(rst-linker) @@ -97,6 +96,8 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog +* Fri Apr 05 2019 Dan Radez - 6.1-4 +- fixing python-jaraco-packaging requires. * Fri Apr 05 2019 Dan Radez - 6.1-3 - adding python-jaraco subpackage. * Fri Apr 05 2019 Dan Radez - 6.1-2 From 9d3652479279ee71791526140d870bcefc8badc0 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Fri, 5 Apr 2019 16:16:33 -0400 Subject: [PATCH 06/19] fixing the requires again --- python-jaraco-packaging.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index 807f2b4..64d2d5b 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -7,7 +7,7 @@ Name: python-%{pkg_name} Version: 6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -16,7 +16,7 @@ Source0: https://files.pythonhosted.org/packages/source/j/%{pypi_name}/%{ BuildArch: noarch %description - Tools for packaging.dependency_tree A dist-utils command for reporting the +Tools for packaging.dependency_tree A dist-utils command for reporting the dependency tree as resolved by setup-tools. Use after installing a package.show A dist-utils command for reporting the attributes of a distribution, such as the version or author name. @@ -31,7 +31,7 @@ A Parent package for jaraco's parent dir and init file. %package -n python3-%{pkg_name} Summary: %{summary} -Requires: python3dist(jaraco) +Requires: python3-jaraco Requires: python3dist(rst-linker) Requires: python3dist(six) >= 1.4 Requires: python3dist(setuptools) @@ -42,7 +42,11 @@ BuildRequires: python3dist(six) >= 1.4 %{?python_provide:%python_provide python3-%{pkg_name}} %description -n python3-%{pkg_name} -%{description} +Tools for packaging.dependency_tree A dist-utils command for reporting the +dependency tree as resolved by setup-tools. Use after installing a package.show +A dist-utils command for reporting the attributes of a distribution, such as the +version or author name. + %if %{with docs} BuildRequires: python3dist(sphinx) @@ -96,11 +100,17 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog +* Fri Apr 05 2019 Dan Radez - 6.1-5 +- fixing python-jaraco-packaging requires... again + * Fri Apr 05 2019 Dan Radez - 6.1-4 - fixing python-jaraco-packaging requires. + * Fri Apr 05 2019 Dan Radez - 6.1-3 - adding python-jaraco subpackage. + * Fri Apr 05 2019 Dan Radez - 6.1-2 - adding py3 subpackage. + * Tue Apr 02 2019 Dan Radez - 6.1-1 - Initial package. From 0492c864df9b2729bbc71aaa8089cf47cb4d56f9 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Mon, 8 Apr 2019 11:12:42 -0400 Subject: [PATCH 07/19] updaing deps in prep to enable docs build --- python-jaraco-packaging.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index 64d2d5b..94ec51a 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -7,7 +7,7 @@ Name: python-%{pkg_name} Version: 6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -50,7 +50,7 @@ version or author name. %if %{with docs} BuildRequires: python3dist(sphinx) -BuildRequires: python3dist(rst-linker) +BuildRequires: python3-rst-linker %package -n python-%{pkg_name}-doc Summary: jaraco.packaging documentation @@ -100,6 +100,9 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog +* Mon Apr 08 2019 Dan Radez - 6.1-6 +- Updating doc reqs in prep to enable doc build + * Fri Apr 05 2019 Dan Radez - 6.1-5 - fixing python-jaraco-packaging requires... again From 8d48089d3201bd799b41b4b09a7a33508d785d69 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Mon, 8 Apr 2019 22:33:50 -0400 Subject: [PATCH 08/19] fixing egg info --- python-jaraco-packaging.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index 94ec51a..b3f9156 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -7,7 +7,7 @@ Name: python-%{pkg_name} Version: 6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -49,11 +49,12 @@ version or author name. %if %{with docs} -BuildRequires: python3dist(sphinx) -BuildRequires: python3-rst-linker - %package -n python-%{pkg_name}-doc Summary: jaraco.packaging documentation + +BuildRequires: python3dist(sphinx) +BuildRequires: python3dist(rst-linker) + %description -n python-%{pkg_name}-doc Documentation for jaraco.packaging %endif @@ -62,6 +63,8 @@ Documentation for jaraco.packaging %autosetup -n %{pypi_name}-%{version} # Remove bundled egg-info rm -rf %{pypi_name}.egg-info +# rename package in setup to - +sed -i 's/name = %{pypi_name}/name = %{pkg_name}/' setup.cfg %build %py3_build @@ -91,7 +94,7 @@ rm -rf html/.{doctrees,buildinfo} %{_bindir}/upload-package %{_bindir}/dependency-tree %{python3_sitelib}/jaraco/packaging -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%{python3_sitelib}/jaraco_packaging-%{version}-py?.?.egg-info %if %{with docs} %files -n python-%{pkg_name}-doc @@ -100,6 +103,9 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog +* Mon Apr 08 2019 Dan Radez - 6.1-7 +- fixing egg info + * Mon Apr 08 2019 Dan Radez - 6.1-6 - Updating doc reqs in prep to enable doc build From 1fc7fe8fa672dc1f0a86d21f11dba6546006d8eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 14:06:38 +0000 Subject: [PATCH 09/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-jaraco-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index b3f9156..1783d3c 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -7,7 +7,7 @@ Name: python-%{pkg_name} Version: 6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -103,6 +103,9 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Apr 08 2019 Dan Radez - 6.1-7 - fixing egg info From 092bc4c89ac8843aefd9a323e4215ed9591919a3 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Fri, 16 Aug 2019 15:49:29 -0400 Subject: [PATCH 10/19] updating to 6.2 --- .gitignore | 1 + python-jaraco-packaging.spec | 9 +++++++-- sources | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2d2c638..9d6b68a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /jaraco.packaging-6.1.tar.gz +/jaraco.packaging-6.2.tar.gz diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index 1783d3c..ecf7110 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -6,8 +6,8 @@ %bcond_with docs Name: python-%{pkg_name} -Version: 6.1 -Release: 8%{?dist} +Version: 6.2 +Release: 1%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -35,10 +35,12 @@ Requires: python3-jaraco Requires: python3dist(rst-linker) Requires: python3dist(six) >= 1.4 Requires: python3dist(setuptools) +Requires: python3dist(importlib-metadata) >= 0.18 BuildRequires: python3dist(setuptools) BuildRequires: python3-setuptools_scm >= 1.15.0 BuildRequires: python3dist(six) >= 1.4 +BuildRequires: python3dist(importlib-metadata) >= 0.18 %{?python_provide:%python_provide python3-%{pkg_name}} %description -n python3-%{pkg_name} @@ -103,6 +105,9 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog +* Fri Aug 16 2019 Dan Radez - 6.2-1 +- updating to 6.2 + * Fri Jul 26 2019 Fedora Release Engineering - 6.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 36ff3d3..bfa70e8 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (jaraco.packaging-6.1.tar.gz) = a84c71bd880879f172e6527987e9ffa681da28803112a0195fb21153cb6cd1b3d5c00a6d21c562d7c5542349f335bea4a349fd22662f22dd7bf9bef7b6b0f7d8 +SHA512 (jaraco.packaging-6.2.tar.gz) = f8496a9dccb29dbac24927b40bc29d472b8c6bdb939bfcacf70196130ba9c961747a8b75c63574352a8bfeb2a512eb849dfba3344e942f1338ea1538e0767f33 From a374f7d7a12e2917f1554403da9260cd04cd24d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:42:10 +0200 Subject: [PATCH 11/19] Rebuilt for Python 3.8 --- python-jaraco-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index ecf7110..6e2ca1c 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -7,7 +7,7 @@ Name: python-%{pkg_name} Version: 6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -105,6 +105,9 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog +* Mon Aug 19 2019 Miro Hrončok - 6.2-2 +- Rebuilt for Python 3.8 + * Fri Aug 16 2019 Dan Radez - 6.2-1 - updating to 6.2 From aca64e70c6798bd50024762d4734e147e07dece7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 20 Aug 2019 00:25:18 +0200 Subject: [PATCH 12/19] Rebuilt for Python 3.8 --- python-jaraco-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index 6e2ca1c..6eb87e0 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -7,7 +7,7 @@ Name: python-%{pkg_name} Version: 6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -105,6 +105,9 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog +* Mon Aug 19 2019 Miro Hrončok - 6.2-3 +- Rebuilt for Python 3.8 + * Mon Aug 19 2019 Miro Hrončok - 6.2-2 - Rebuilt for Python 3.8 From 6d558b7da49dadf91b1433f258cf687768c80919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 20 Aug 2019 11:05:42 +0200 Subject: [PATCH 13/19] Don't require importlib-metadata on Python 3.8+ --- python-jaraco-packaging.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index 6eb87e0..a5247c0 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -35,12 +35,16 @@ Requires: python3-jaraco Requires: python3dist(rst-linker) Requires: python3dist(six) >= 1.4 Requires: python3dist(setuptools) -Requires: python3dist(importlib-metadata) >= 0.18 BuildRequires: python3dist(setuptools) BuildRequires: python3-setuptools_scm >= 1.15.0 BuildRequires: python3dist(six) >= 1.4 + +%if 0%{python3_version_nodots} < 38 +Requires: python3dist(importlib-metadata) >= 0.18 BuildRequires: python3dist(importlib-metadata) >= 0.18 +%endif + %{?python_provide:%python_provide python3-%{pkg_name}} %description -n python3-%{pkg_name} From de6248436bca5c4641dbbd1469cf21b9d4934461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 20 Aug 2019 11:08:50 +0200 Subject: [PATCH 14/19] Don't fail when %python3_version_nodots is undefined --- python-jaraco-packaging.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index a5247c0..10f9809 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -40,7 +40,7 @@ BuildRequires: python3dist(setuptools) BuildRequires: python3-setuptools_scm >= 1.15.0 BuildRequires: python3dist(six) >= 1.4 -%if 0%{python3_version_nodots} < 38 +%if 0%{?python3_version_nodots} < 38 Requires: python3dist(importlib-metadata) >= 0.18 BuildRequires: python3dist(importlib-metadata) >= 0.18 %endif From decf9b0d55320f300fc8d280c9da88ccb8097836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 20 Aug 2019 11:19:42 +0200 Subject: [PATCH 15/19] Switch conditional BR to a rich BR ...to avoid problems when the SRPM is built without Python macros. --- python-jaraco-packaging.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index 10f9809..feda9f2 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -42,8 +42,8 @@ BuildRequires: python3dist(six) >= 1.4 %if 0%{?python3_version_nodots} < 38 Requires: python3dist(importlib-metadata) >= 0.18 -BuildRequires: python3dist(importlib-metadata) >= 0.18 %endif +BuildRequires: (python3dist(importlib-metadata) >= 0.18 if python3 < 3.8) %{?python_provide:%python_provide python3-%{pkg_name}} From de3dc5538093e1680a49073a8fda4b9d50f513cf Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 20 Aug 2019 10:39:05 -0400 Subject: [PATCH 16/19] remove the sed . to _ --- python-jaraco-packaging.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index feda9f2..6ff585d 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -7,7 +7,7 @@ Name: python-%{pkg_name} Version: 6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -69,8 +69,6 @@ Documentation for jaraco.packaging %autosetup -n %{pypi_name}-%{version} # Remove bundled egg-info rm -rf %{pypi_name}.egg-info -# rename package in setup to - -sed -i 's/name = %{pypi_name}/name = %{pkg_name}/' setup.cfg %build %py3_build @@ -100,7 +98,7 @@ rm -rf html/.{doctrees,buildinfo} %{_bindir}/upload-package %{_bindir}/dependency-tree %{python3_sitelib}/jaraco/packaging -%{python3_sitelib}/jaraco_packaging-%{version}-py?.?.egg-info +%{python3_sitelib}/jaraco.packaging-%{version}-py?.?.egg-info %if %{with docs} %files -n python-%{pkg_name}-doc @@ -109,6 +107,9 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog +* Tue Aug 20 2019 Dan Radez - 6.2-4 +- removing the sed . to _ it's confusing and not needed + * Mon Aug 19 2019 Miro Hrončok - 6.2-3 - Rebuilt for Python 3.8 From 545c245b3dd0c36d2fcb3efb67fa688a05b35680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 20 Aug 2019 16:58:44 +0200 Subject: [PATCH 17/19] Fix dependency on rst.linker --- python-jaraco-packaging.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index 6ff585d..2ed9f76 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -7,7 +7,7 @@ Name: python-%{pkg_name} Version: 6.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -32,7 +32,7 @@ A Parent package for jaraco's parent dir and init file. %package -n python3-%{pkg_name} Summary: %{summary} Requires: python3-jaraco -Requires: python3dist(rst-linker) +Requires: python3dist(rst.linker) Requires: python3dist(six) >= 1.4 Requires: python3dist(setuptools) @@ -59,7 +59,7 @@ version or author name. Summary: jaraco.packaging documentation BuildRequires: python3dist(sphinx) -BuildRequires: python3dist(rst-linker) +BuildRequires: python3dist(rst.linker) %description -n python-%{pkg_name}-doc Documentation for jaraco.packaging @@ -107,6 +107,9 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog +* Tue Aug 20 2019 Miro Hrončok - 6.2-5 +- Fix dependency on rst.linker + * Tue Aug 20 2019 Dan Radez - 6.2-4 - removing the sed . to _ it's confusing and not needed From 726561349b034431fa3407be870555578b4d1009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:15:50 +0200 Subject: [PATCH 18/19] Rebuilt for Python 3.8.0rc1 (#1748018) --- python-jaraco-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index 2ed9f76..c37bf1d 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -7,7 +7,7 @@ Name: python-%{pkg_name} Version: 6.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tools to supplement packaging Python releases License: MIT @@ -107,6 +107,9 @@ rm -rf html/.{doctrees,buildinfo} %endif %changelog +* Thu Oct 03 2019 Miro Hrončok - 6.2-6 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Tue Aug 20 2019 Miro Hrončok - 6.2-5 - Fix dependency on rst.linker From 5fdf53fe69c2e87e8d058ef684a2b632dd43d24e Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 15 Nov 2019 20:37:38 +0000 Subject: [PATCH 19/19] add build requirement zipp --- python-jaraco-packaging.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-jaraco-packaging.spec b/python-jaraco-packaging.spec index c37bf1d..f36af90 100644 --- a/python-jaraco-packaging.spec +++ b/python-jaraco-packaging.spec @@ -39,6 +39,7 @@ Requires: python3dist(setuptools) BuildRequires: python3dist(setuptools) BuildRequires: python3-setuptools_scm >= 1.15.0 BuildRequires: python3dist(six) >= 1.4 +BuildRequires: python3-zipp >= 0.5 %if 0%{?python3_version_nodots} < 38 Requires: python3dist(importlib-metadata) >= 0.18