From 9240b72f7ee14b9628ecdba80af46958bf19250d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 31 Mar 2020 13:46:48 +0000 Subject: [PATCH 01/83] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..4835af6 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# python-rpmautospec + +The python-rpmautospec package \ No newline at end of file From 1e3af47600dc15ea4ff1f7c76e67d7a602146aaa Mon Sep 17 00:00:00 2001 From: Adam Saleh Date: Thu, 2 Apr 2020 15:32:04 +0200 Subject: [PATCH 02/83] Initial upload to the source repo. Signed-off-by: Adam Saleh --- .gitignore | 1 + python-rpmautospec.spec | 167 ++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 169 insertions(+) create mode 100644 .gitignore create mode 100644 python-rpmautospec.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..64d8f9c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/rpmautospec-0.0.5.tar.gz diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec new file mode 100644 index 0000000..15c2521 --- /dev/null +++ b/python-rpmautospec.spec @@ -0,0 +1,167 @@ +%global srcname rpmautospec + +# Up to EL7, the Koji hub plugin is run under Python 2.x and Python files in private directories +# would be byte-compiled. +%if ! 0%{?rhel} || 0%{?rhel} > 7 +%bcond_with epel_le_7 +%else +%bcond_without epel_le_7 +# We don't want to byte-compile Python files in private directories, i.e. the Koji plugins. As a +# side effect, this doesn't byte-compile Python files in the system locations either, huzzah! +%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') +%endif + +Name: python-rpmautospec +Version: 0.0.5 +Release: 1%{?dist} +Summary: Package and CLI tool to generate release fields and changelogs + +License: MIT +URL: https://pagure.io/Fedora-Infra/rpmautospec +Source0: https://releases.pagure.org/Fedora-Infra/rpmautospec/rpmautospec-%{version}.tar.gz + +BuildArch: noarch +BuildRequires: python3-devel >= 3.6.0 +%if %{with epel_le_7} +BuildRequires: python2-devel +%endif +# EPEL7 does not have python3-koji and the other dependencies here are only +# needed in the buildroot for the tests, which can't run because of the lack of +# python3-koji +%if ! %{with epel_le_7} +BuildRequires: koji +BuildRequires: python3-koji +BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: git +%endif + +%global _description %{expand: +A package and CLI tool to generate RPM release fields and changelogs.} + +%description %_description + +# package the library + +%package -n python3-%{srcname} +Summary: %{summary} +%{?python_provide:%python_provide python3-%{srcname}} + +Requires: koji +Requires: python3-rpm +Requires: python3-koji + +%description -n python3-%{srcname} %_description + +# Note that there is no %%files section for the unversioned python module +%files -n python3-%{srcname} +%license LICENSE +%doc README.rst +%{python3_sitelib}/%{srcname}-*.egg-info +%{python3_sitelib}/%{srcname}/ + +# package the cli tool + +%package -n %{srcname} +Summary: CLI tool for generating RPM releases and changelogs +Requires: python3-%{srcname} = %{version}-%{release} + +%description -n %{srcname} +CLI tool for generating RPM releases and changelogs + +%files -n %{srcname} +%{_bindir}/rpmautospec + +# package the Koji plugins + +%package -n koji-builder-plugin-rpmautospec +Summary: Koji plugin for generating RPM releases and changelogs +Requires: python3-%{srcname} = %{version}-%{release} +Requires: python3-koji +Requires: koji-builder-plugins + +%description -n koji-builder-plugin-rpmautospec +A Koji plugin for generating RPM releases and changelogs. + +%files -n koji-builder-plugin-rpmautospec +%{_prefix}/lib/koji-builder-plugins/* + +%package -n koji-hub-plugin-rpmautospec +Summary: Koji plugin for tagging successful builds in dist-git +%if ! %{with epel_le_7} +Requires: python3-%{srcname} = %{version}-%{release} +Requires: python3-koji +%endif +Requires: koji-hub-plugins + +%description -n koji-hub-plugin-rpmautospec +A Koji plugin for tagging successful builds in their dist-git repository. + +%files -n koji-hub-plugin-rpmautospec +%if %{with epel_le_7} +%{python2_sitelib}/rpmautospec/ +%endif +%{_prefix}/lib/koji-hub-plugins/* + +%config(noreplace) %{_sysconfdir}/koji-hub/plugins/rpmautospec_hub.conf + +#-------------------------------------------------------- + +%prep +%autosetup -n %{srcname}-%{version} + +%build +%py3_build + +%install +%py3_install +for plugin_type in builder hub; do + mkdir -p %{buildroot}%{_prefix}/lib/koji-${plugin_type}-plugins/ + install -m 0644 koji_plugins/rpmautospec_${plugin_type}.py \ + %{buildroot}%{_prefix}/lib/koji-${plugin_type}-plugins/ +done + +%if %{with epel_le_7} +# the hub-plugin py2 tagging library +# Install the py2compat files to the koji-hub-plugin +mkdir -p %{buildroot}%{python2_sitelib}/rpmautospec/py2compat/ +touch %{buildroot}%{python2_sitelib}/rpmautospec/__init__.py \ + %{buildroot}%{python2_sitelib}/rpmautospec/py2compat/__init__.py +install -m 0644 rpmautospec/py2compat/tagging.py \ + %{buildroot}%{python2_sitelib}/rpmautospec/py2compat/ + +# EL <= 7: Byte-compile all the things +%py_byte_compile %{python3} %{buildroot}%{python3_sitelib} +%py_byte_compile %{python2} %{buildroot}%{python2_sitelib} +%py_byte_compile %{python2} %{buildroot}%{_prefix}/lib/koji-hub-plugins/ +%else +# EL > 7, Fedora +%py_byte_compile %{python3} %{buildroot}%{_prefix}/lib/koji-hub-plugins/ +%endif +%py_byte_compile %{python3} %{buildroot}%{_prefix}/lib/koji-builder-plugins/ + +# the hub-plugin config +mkdir -p %{buildroot}%{_sysconfdir}/koji-hub/plugins/ +install -m 0644 koji_plugins/rpmautospec_hub.conf %{buildroot}%{_sysconfdir}/koji-hub/plugins/rpmautospec_hub.conf + +# EPEL7 does not have python3-koji which is needed to run the tests, so there +# is no point in running them +%if ! 0%{?rhel} || 0%{?rhel} > 7 +%check +%{__python3} -m pytest +%endif + +%changelog +* Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.5-1 +- Update to 0.0.5 + +* Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.4-1 +- Update to 0.0.4 + +* Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.3-1 +- Update to 0.0.3 + +* Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.2-1 +- Update to 0.0.2 + +* Wed Mar 18 2020 Adam Saleh - 0.0.1-1 +- initial package for Fedora diff --git a/sources b/sources new file mode 100644 index 0000000..faf9daf --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (rpmautospec-0.0.5.tar.gz) = 616b5084a1ec81402317afd73bcd76be74d7bb293aa7dc38d1c89faaab30c7e121662ee64c35274724669fd79f3304cd5d65b0251aa68aefbf73b525f68cfd44 From 1089598050fcaba1df00606c87c459841cbbe8f5 Mon Sep 17 00:00:00 2001 From: Adam Saleh Date: Thu, 2 Apr 2020 18:17:23 +0200 Subject: [PATCH 03/83] Update to 0.0.6 --- .gitignore | 1 + python-rpmautospec.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 64d8f9c..958a52c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /rpmautospec-0.0.5.tar.gz +/rpmautospec-0.0.6.tar.gz diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 15c2521..2c47e27 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.5 +Version: 0.0.6 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -32,6 +32,7 @@ BuildRequires: python2-devel BuildRequires: koji BuildRequires: python3-koji BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion}-pytest-cov BuildRequires: git %endif @@ -151,6 +152,9 @@ install -m 0644 koji_plugins/rpmautospec_hub.conf %{buildroot}%{_sysconfdir}/koj %endif %changelog +* Thu Apr 02 2020 Pierre-Yves Chibon - 0.0.6-1 +- Update to 0.0.6 + * Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.5-1 - Update to 0.0.5 diff --git a/sources b/sources index faf9daf..7b3fae1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.5.tar.gz) = 616b5084a1ec81402317afd73bcd76be74d7bb293aa7dc38d1c89faaab30c7e121662ee64c35274724669fd79f3304cd5d65b0251aa68aefbf73b525f68cfd44 +SHA512 (rpmautospec-0.0.6.tar.gz) = 87bf7067cdd80e5e66740dc8ff1f702d35ab9f2b0dbc5827d2150049221c9662804cc4ab58c6cacf89fe0b520bbfba7b5e74805a8fffb7b0416b2f8ab89eb677 From e0c0a985ea9f192b37cb91eacfd08c289f4e76e8 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 3 Apr 2020 16:10:45 +0200 Subject: [PATCH 04/83] Upload new sources and tweak the .gitignore file Signed-off-by: Pierre-Yves Chibon --- .gitignore | 3 +-- sources | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 958a52c..f6cd7a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/rpmautospec-0.0.5.tar.gz -/rpmautospec-0.0.6.tar.gz +/rpmautospec-*.tar.gz diff --git a/sources b/sources index 7b3fae1..9f735f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.6.tar.gz) = 87bf7067cdd80e5e66740dc8ff1f702d35ab9f2b0dbc5827d2150049221c9662804cc4ab58c6cacf89fe0b520bbfba7b5e74805a8fffb7b0416b2f8ab89eb677 +SHA512 (rpmautospec-0.0.7.tar.gz) = 1777e369e6dbac3eb69c96cc9e0042280a5d62c8a1345a4c2b8a104c937f69c7b80c5a7ef4a974fb18b7c439ed6d86305e5b0817be930454843762e016594a14 From 9fcc8bd785dfb6804b3526f1f8d1769bf8c75541 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 3 Apr 2020 16:16:55 +0200 Subject: [PATCH 05/83] Update to 0.0.7 --- python-rpmautospec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 2c47e27..2f1ef6c 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.6 +Version: 0.0.7 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -152,6 +152,9 @@ install -m 0644 koji_plugins/rpmautospec_hub.conf %{buildroot}%{_sysconfdir}/koj %endif %changelog +* Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.7-1 +- Update to 0.0.7 + * Thu Apr 02 2020 Pierre-Yves Chibon - 0.0.6-1 - Update to 0.0.6 From 05ca14f7e9b8ebcc09b5256200aa8e510c581d33 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 3 Apr 2020 17:10:43 +0200 Subject: [PATCH 06/83] Upload the sources for 0.0.8 Signed-off-by: Pierre-Yves Chibon --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 9f735f4..92d01bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.7.tar.gz) = 1777e369e6dbac3eb69c96cc9e0042280a5d62c8a1345a4c2b8a104c937f69c7b80c5a7ef4a974fb18b7c439ed6d86305e5b0817be930454843762e016594a14 +SHA512 (rpmautospec-0.0.8.tar.gz) = 8386f4e8d7997d9734e2d297a9b6e4e0daab99ff76ef27bc429a5d3d8ad268ec4b1ada09ffe96af40e9c9455cd30bb603779ab37ea9537a1dfde9ab605f5a9f8 From 8e5b65f98bd04676028f9587d86ded512b0dedcb Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 3 Apr 2020 17:13:55 +0200 Subject: [PATCH 07/83] Update to 0.0.8 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 2f1ef6c..79c4442 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.7 +Version: 0.0.8 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -152,6 +152,9 @@ install -m 0644 koji_plugins/rpmautospec_hub.conf %{buildroot}%{_sysconfdir}/koj %endif %changelog +* Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.8-1 +- Update to 0.0.8 + * Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.7-1 - Update to 0.0.7 From 92836a9eba892c2d2d30988ec6eee95803f893ff Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 3 Apr 2020 17:52:33 +0200 Subject: [PATCH 08/83] Remove koji from the requirements.txt file Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 79c4442..54d5f4c 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -13,7 +13,7 @@ Name: python-rpmautospec Version: 0.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -109,6 +109,9 @@ A Koji plugin for tagging successful builds in their dist-git repository. %prep %autosetup -n %{srcname}-%{version} +# The python3-koji package doesn't declare itself properly, so we may not depend on it when +# installed as an RPM. +sed -i d/koji/ requirements.txt %build %py3_build @@ -152,6 +155,9 @@ install -m 0644 koji_plugins/rpmautospec_hub.conf %{buildroot}%{_sysconfdir}/koj %endif %changelog +* Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.8-2 +- Remove koji from the requirements.txt file + * Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.8-1 - Update to 0.0.8 From 0f04468c250c2cedd1b9ceaf378cdb825ed96c72 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 3 Apr 2020 18:04:03 +0200 Subject: [PATCH 09/83] Upload sources for 0.0.9 Signed-off-by: Pierre-Yves Chibon --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 92d01bd..d4db6a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.8.tar.gz) = 8386f4e8d7997d9734e2d297a9b6e4e0daab99ff76ef27bc429a5d3d8ad268ec4b1ada09ffe96af40e9c9455cd30bb603779ab37ea9537a1dfde9ab605f5a9f8 +SHA512 (rpmautospec-0.0.9.tar.gz) = 8e26308953b82a242a131ae0b6905483d957e9f50f479a4698764b611d87ee23fc568d2411ddac9dd0ddbbd4845657d85672dea75b51ad12e916357cabd7158b From 86db26b7f19bc313440e9b592c594d04201f3d4a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 3 Apr 2020 18:06:02 +0200 Subject: [PATCH 10/83] Update to 0.0.9 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 54d5f4c..8819719 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,8 +12,8 @@ %endif Name: python-rpmautospec -Version: 0.0.8 -Release: 2%{?dist} +Version: 0.0.9 +Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -155,8 +155,8 @@ install -m 0644 koji_plugins/rpmautospec_hub.conf %{buildroot}%{_sysconfdir}/koj %endif %changelog -* Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.8-2 -- Remove koji from the requirements.txt file +* Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.9-1 +- Update to 0.0.9 * Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.8-1 - Update to 0.0.8 From 84e700b3dc10d781ce4d7b80b4fdda3cea7ab360 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 3 Apr 2020 18:13:24 +0200 Subject: [PATCH 11/83] fix typo Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 8819719..a36153e 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -111,7 +111,7 @@ A Koji plugin for tagging successful builds in their dist-git repository. %autosetup -n %{srcname}-%{version} # The python3-koji package doesn't declare itself properly, so we may not depend on it when # installed as an RPM. -sed -i d/koji/ requirements.txt +sed -i /koji/d requirements.txt %build %py3_build From 27c36e2d71df47b326f5f2c16ffd89982099ffd0 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 3 Apr 2020 19:42:56 +0200 Subject: [PATCH 12/83] Update to 0.0.10 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index a36153e..8b5ad48 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.9 +Version: 0.0.10 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -155,6 +155,9 @@ install -m 0644 koji_plugins/rpmautospec_hub.conf %{buildroot}%{_sysconfdir}/koj %endif %changelog +* Fri Apr 03 2020 Nils Philippsen - 0.0.10-1 +- Update to 0.0.10 + * Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.9-1 - Update to 0.0.9 diff --git a/sources b/sources index d4db6a2..9470d7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.9.tar.gz) = 8e26308953b82a242a131ae0b6905483d957e9f50f479a4698764b611d87ee23fc568d2411ddac9dd0ddbbd4845657d85672dea75b51ad12e916357cabd7158b +SHA512 (rpmautospec-0.0.10.tar.gz) = d5029fc2fa1b5de61105be7ebc19bfbd18700c4ae2890b281a38690e9d3da908afb1aab883d3e888d907dcbce67c7214a5ccd7a29cd2b2e9de5d240a537c220f From b3eac4d3c76bb9dac4b6517864c166ca033e9879 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mon, 6 Apr 2020 16:45:00 +0200 Subject: [PATCH 13/83] Update to 0.0.11 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 20 +++++++++++++++----- sources | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 8b5ad48..51dd8ec 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.10 +Version: 0.0.11 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -48,6 +48,8 @@ Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} Requires: koji +Requires: git-core +Requires: rpm-build Requires: python3-rpm Requires: python3-koji @@ -86,6 +88,8 @@ A Koji plugin for generating RPM releases and changelogs. %files -n koji-builder-plugin-rpmautospec %{_prefix}/lib/koji-builder-plugins/* +%config(noreplace) %{_sysconfdir}/kojid/plugins/rpmautospec.conf + %package -n koji-hub-plugin-rpmautospec Summary: Koji plugin for tagging successful builds in dist-git %if ! %{with epel_le_7} @@ -103,7 +107,7 @@ A Koji plugin for tagging successful builds in their dist-git repository. %endif %{_prefix}/lib/koji-hub-plugins/* -%config(noreplace) %{_sysconfdir}/koji-hub/plugins/rpmautospec_hub.conf +%config(noreplace) %{_sysconfdir}/koji-hub/plugins/rpmautospec.conf #-------------------------------------------------------- @@ -143,9 +147,12 @@ install -m 0644 rpmautospec/py2compat/tagging.py \ %endif %py_byte_compile %{python3} %{buildroot}%{_prefix}/lib/koji-builder-plugins/ -# the hub-plugin config -mkdir -p %{buildroot}%{_sysconfdir}/koji-hub/plugins/ -install -m 0644 koji_plugins/rpmautospec_hub.conf %{buildroot}%{_sysconfdir}/koji-hub/plugins/rpmautospec_hub.conf +# configuration shared by the plugins +for dest in kojid koji-hub; do + mkdir -p %{buildroot}%{_sysconfdir}/$dest/plugins/ + install -m 0644 koji_plugins/rpmautospec.conf \ + %{buildroot}%{_sysconfdir}/$dest/plugins/rpmautospec.conf +done # EPEL7 does not have python3-koji which is needed to run the tests, so there # is no point in running them @@ -155,6 +162,9 @@ install -m 0644 koji_plugins/rpmautospec_hub.conf %{buildroot}%{_sysconfdir}/koj %endif %changelog +* Mon Apr 06 2020 Pierre-Yves Chibon - 0.0.11-1 +- Update to 0.0.11 + * Fri Apr 03 2020 Nils Philippsen - 0.0.10-1 - Update to 0.0.10 diff --git a/sources b/sources index 9470d7d..d108da3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.10.tar.gz) = d5029fc2fa1b5de61105be7ebc19bfbd18700c4ae2890b281a38690e9d3da908afb1aab883d3e888d907dcbce67c7214a5ccd7a29cd2b2e9de5d240a537c220f +SHA512 (rpmautospec-0.0.11.tar.gz) = 56dc5ee88631e8efd36492648567b5dcb02d38169a2dd572a3ce57949e1bd612655f36fcee0e30a57f2fe777a8232167daf1c7a2455e9cea0b616e6d152a1875 From 6e3c91c8164c85ab43a03465e9465c7bb13c8b36 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 7 Apr 2020 11:26:49 +0200 Subject: [PATCH 14/83] Update to 0.0.12 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 10 ++++++++-- sources | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 51dd8ec..9d7f9c4 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.11 +Version: 0.0.12 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -49,7 +49,6 @@ Summary: %{summary} Requires: koji Requires: git-core -Requires: rpm-build Requires: python3-rpm Requires: python3-koji @@ -67,6 +66,10 @@ Requires: python3-koji %package -n %{srcname} Summary: CLI tool for generating RPM releases and changelogs Requires: python3-%{srcname} = %{version}-%{release} +# We add this require here and not in python3-rpmautospec because we do not want +# it on the builders, the hub and builders plugins will work fine without it but +# we need this in the chroot or when packagers run the CLI on their machines. +Requires: rpm-build %description -n %{srcname} CLI tool for generating RPM releases and changelogs @@ -162,6 +165,9 @@ done %endif %changelog +* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.12-1 +- Update to 0.0.12 + * Mon Apr 06 2020 Pierre-Yves Chibon - 0.0.11-1 - Update to 0.0.11 diff --git a/sources b/sources index d108da3..57e1231 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.11.tar.gz) = 56dc5ee88631e8efd36492648567b5dcb02d38169a2dd572a3ce57949e1bd612655f36fcee0e30a57f2fe777a8232167daf1c7a2455e9cea0b616e6d152a1875 +SHA512 (rpmautospec-0.0.12.tar.gz) = 4b9cae223cd5af5774f25a12c706846ccef0d83b2032947fd4e56a75e3e0df24bfd198d91a412818b7eace9bec49fa5269177beafb6bacb5c82397b7986e14b7 From 8674f092cfd6f77b5731d61087f516a2fb3bc0ec Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 7 Apr 2020 12:06:04 +0200 Subject: [PATCH 15/83] Update to 0.0.13 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 9d7f9c4..7098a85 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.12 +Version: 0.0.13 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -165,6 +165,9 @@ done %endif %changelog +* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.13-1 +- Update to 0.0.13 + * Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.12-1 - Update to 0.0.12 diff --git a/sources b/sources index 57e1231..3471b62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.12.tar.gz) = 4b9cae223cd5af5774f25a12c706846ccef0d83b2032947fd4e56a75e3e0df24bfd198d91a412818b7eace9bec49fa5269177beafb6bacb5c82397b7986e14b7 +SHA512 (rpmautospec-0.0.13.tar.gz) = 259858852f8d6d83e667bf14b54a9c40579a05727713ab956fcf1561822c1f14fb697f1dd8c07a96311c79708760c71dd744307e73d820ec9ad2cc6cb8130c58 From 412a3d7a2cb4b5a0344faaf47703eacae4d6a75d Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 7 Apr 2020 12:22:14 +0200 Subject: [PATCH 16/83] Update to 0.0.14 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 7098a85..4356afd 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.13 +Version: 0.0.14 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -165,6 +165,9 @@ done %endif %changelog +* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.14-1 +- Update to 0.0.14 + * Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.13-1 - Update to 0.0.13 diff --git a/sources b/sources index 3471b62..1963d86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.13.tar.gz) = 259858852f8d6d83e667bf14b54a9c40579a05727713ab956fcf1561822c1f14fb697f1dd8c07a96311c79708760c71dd744307e73d820ec9ad2cc6cb8130c58 +SHA512 (rpmautospec-0.0.14.tar.gz) = 36eee0a139c7db2d06438ac87f1639eb2a08273b9dad9db982b48744500ebf4cef75a24595fac25d4a187f4f0fccba85288bcc4b38dba2b19cecae879eeed7cf From 0a9e6f3a132c1a1949f8208444c6de329e2c1bf5 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 7 Apr 2020 14:51:07 +0200 Subject: [PATCH 17/83] Update to 0.0.15 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 4356afd..36ee524 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.14 +Version: 0.0.15 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -165,6 +165,9 @@ done %endif %changelog +* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.15-1 +- Update to 0.0.15 + * Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.14-1 - Update to 0.0.14 diff --git a/sources b/sources index 1963d86..f881c46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.14.tar.gz) = 36eee0a139c7db2d06438ac87f1639eb2a08273b9dad9db982b48744500ebf4cef75a24595fac25d4a187f4f0fccba85288bcc4b38dba2b19cecae879eeed7cf +SHA512 (rpmautospec-0.0.15.tar.gz) = e9f41de4ccbdcb1bce8bed207819e09b91b3a1a412e82c310995b8a33e5c1e60fce9ffde00a62eae59925dfdde12778d24e436e3e5396422907071d6f2cadfff From 86bd440755d1ecada2d8e70d9dae12af6a86954b Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 7 Apr 2020 17:23:51 +0200 Subject: [PATCH 18/83] Update to 0.0.16 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 36ee524..ba52716 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.15 +Version: 0.0.16 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -165,6 +165,9 @@ done %endif %changelog +* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.16-1 +- Update to 0.0.16 + * Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.15-1 - Update to 0.0.15 diff --git a/sources b/sources index f881c46..78b25a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.15.tar.gz) = e9f41de4ccbdcb1bce8bed207819e09b91b3a1a412e82c310995b8a33e5c1e60fce9ffde00a62eae59925dfdde12778d24e436e3e5396422907071d6f2cadfff +SHA512 (rpmautospec-0.0.16.tar.gz) = bff8d499ccc3b2dfc656961c130996e7c61d028051a8c16b1c99fef236be8c6514121659015887e3ee4bab3c89d558a046ae3a8756b1b638d1eea996a802d73c From 6e98e75de4c6b03f45a5be0847376a4408c29189 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 7 Apr 2020 18:14:33 +0200 Subject: [PATCH 19/83] Update to 0.0.17 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index ba52716..448ddb8 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.16 +Version: 0.0.17 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -165,6 +165,9 @@ done %endif %changelog +* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.17-1 +- Update to 0.0.17 + * Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.16-1 - Update to 0.0.16 diff --git a/sources b/sources index 78b25a7..be5f7fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.16.tar.gz) = bff8d499ccc3b2dfc656961c130996e7c61d028051a8c16b1c99fef236be8c6514121659015887e3ee4bab3c89d558a046ae3a8756b1b638d1eea996a802d73c +SHA512 (rpmautospec-0.0.17.tar.gz) = fc57396d8b0fb1c25b45cd7cda8d33e7b78c79f9a7db08970796c7077a855db710784898fb64fdee603df90cbfc8fdb28fdb2fe0a4c5493dc49fdb256e2d91dc From 90ff21989bb387430d4f4cfef3e78b149e5247af Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Wed, 8 Apr 2020 10:01:50 +0200 Subject: [PATCH 20/83] Update to 0.0.18 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 448ddb8..7a16e34 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.17 +Version: 0.0.18 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -165,6 +165,9 @@ done %endif %changelog +* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.18-1 +- Update to 0.0.18 + * Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.17-1 - Update to 0.0.17 diff --git a/sources b/sources index be5f7fe..add564e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.17.tar.gz) = fc57396d8b0fb1c25b45cd7cda8d33e7b78c79f9a7db08970796c7077a855db710784898fb64fdee603df90cbfc8fdb28fdb2fe0a4c5493dc49fdb256e2d91dc +SHA512 (rpmautospec-0.0.18.tar.gz) = 90a6ea8e899a7aa5abf3ca232920811402268a8417d9be466d07bd3869ece49246d4ab04a65fc20547f6a132c8d3cb888e837bbed9dc1400b996bf3564d19a22 From c37efaa802a7dc9e4e566b67a5ea918dbd5a2a10 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Wed, 8 Apr 2020 10:40:08 +0200 Subject: [PATCH 21/83] Update to 0.0.19 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 7a16e34..1c21eff 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.18 +Version: 0.0.19 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -165,6 +165,9 @@ done %endif %changelog +* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.19-1 +- Update to 0.0.19 + * Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.18-1 - Update to 0.0.18 diff --git a/sources b/sources index add564e..6093b9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.18.tar.gz) = 90a6ea8e899a7aa5abf3ca232920811402268a8417d9be466d07bd3869ece49246d4ab04a65fc20547f6a132c8d3cb888e837bbed9dc1400b996bf3564d19a22 +SHA512 (rpmautospec-0.0.19.tar.gz) = 22b23c468a9d0299a3463a1cb2847911b02925059f20fd8e38b718a2018c98ba3bbd4a5ca759d76e30bdc9baf44d0dfb6648dd451b5d4c679b80d29ca925b71c From e2a23c3d243a8956e78d6899c92a78f434fa870c Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Wed, 8 Apr 2020 10:50:22 +0200 Subject: [PATCH 22/83] Update to 0.0.20 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 1c21eff..a12fb41 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.19 +Version: 0.0.20 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -165,6 +165,9 @@ done %endif %changelog +* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.20-1 +- Update to 0.0.20 + * Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.19-1 - Update to 0.0.19 diff --git a/sources b/sources index 6093b9d..6d0924b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.19.tar.gz) = 22b23c468a9d0299a3463a1cb2847911b02925059f20fd8e38b718a2018c98ba3bbd4a5ca759d76e30bdc9baf44d0dfb6648dd451b5d4c679b80d29ca925b71c +SHA512 (rpmautospec-0.0.20.tar.gz) = cdab23d2bf1600886e6737726d535b66a836a1039a3131852e2857fd66ae163a5f045b129ddcde14012c6c221150a8b227582f201aec987283d2913da202ddc9 From 47f5c8219749a13d1ad9ae1bcf860d3c9261417b Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Wed, 8 Apr 2020 11:15:56 +0200 Subject: [PATCH 23/83] Update to 0.0.21 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index a12fb41..7e145e9 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.20 +Version: 0.0.21 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -165,6 +165,9 @@ done %endif %changelog +* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.21-1 +- Update to 0.0.21 + * Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.20-1 - Update to 0.0.20 diff --git a/sources b/sources index 6d0924b..d104c68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.20.tar.gz) = cdab23d2bf1600886e6737726d535b66a836a1039a3131852e2857fd66ae163a5f045b129ddcde14012c6c221150a8b227582f201aec987283d2913da202ddc9 +SHA512 (rpmautospec-0.0.21.tar.gz) = c2faac5bf7eef105c6832582b8ea8e0c79a383623f61fdb0fdd6333e2c093bfd10fa6d8cf2a316509916716196aa84b75f044d8ffb191ba596dc5bc8f00b6b7f From b7e98971d96262665b7aa598a36e455ec3a68ffd Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Wed, 8 Apr 2020 18:18:13 +0200 Subject: [PATCH 24/83] Update to 0.0.22 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 7e145e9..d3f5f8b 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.21 +Version: 0.0.22 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -165,6 +165,9 @@ done %endif %changelog +* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.22-1 +- Update to 0.0.22 + * Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.21-1 - Update to 0.0.21 diff --git a/sources b/sources index d104c68..f91bf20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.21.tar.gz) = c2faac5bf7eef105c6832582b8ea8e0c79a383623f61fdb0fdd6333e2c093bfd10fa6d8cf2a316509916716196aa84b75f044d8ffb191ba596dc5bc8f00b6b7f +SHA512 (rpmautospec-0.0.22.tar.gz) = 3cab8d853854d1ac6709dda89a27c7b7b0f002dbe4240bce20e1cc911a996fa77bccd5658fbca302e3bcb14b7e3ae21ce38892c3827e4c340209da2397030d83 From 7d59399526d56dfdac95dda10d06c46bdc3cb27c Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Wed, 8 Apr 2020 21:25:44 +0200 Subject: [PATCH 25/83] Update to 0.023 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index d3f5f8b..8b83694 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.22 +Version: 0.0.23 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -165,6 +165,9 @@ done %endif %changelog +* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.23-1 +- Update to 0.023 + * Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.22-1 - Update to 0.0.22 From 2336c837b23564454eb15bf8f00c8fd415d4e0cd Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Wed, 8 Apr 2020 21:26:50 +0200 Subject: [PATCH 26/83] Update to 0.0.23 Signed-off-by: Pierre-Yves Chibon --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index f91bf20..9191ed7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.22.tar.gz) = 3cab8d853854d1ac6709dda89a27c7b7b0f002dbe4240bce20e1cc911a996fa77bccd5658fbca302e3bcb14b7e3ae21ce38892c3827e4c340209da2397030d83 +SHA512 (rpmautospec-0.0.23.tar.gz) = 63be1c8477bb837795911d67fea24015df981fd75dc95051a87da5d0369f1cfece0280aa14ed92b358c4b4127080cb00d57105050e6a6521abd91df5312322bc From 9eef233703acd5daeb7aeb1dd0d12cde36c9ee40 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Thu, 9 Apr 2020 13:55:00 +0200 Subject: [PATCH 27/83] Update to 0.1.0 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 21 ++++++++++++++++++++- sources | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 8b83694..038cb2b 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.0.23 +Version: 0.1.0 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -112,6 +112,18 @@ A Koji plugin for tagging successful builds in their dist-git repository. %config(noreplace) %{_sysconfdir}/koji-hub/plugins/rpmautospec.conf +# Package the placeholder rpm-macros + +%package -n rpmautospec-rpm-macros +Summary: Rpmautospec RPM macros for local rpmbuild +Requires: rpm + +%description -n rpmautospec-rpm-macros +RPM macros with placeholders for building rpmautospec enabled packages localy + +%files -n rpmautospec-rpm-macros +%{rpmmacrodir}/macros.rpmautospec + #-------------------------------------------------------- %prep @@ -157,6 +169,10 @@ for dest in kojid koji-hub; do %{buildroot}%{_sysconfdir}/$dest/plugins/rpmautospec.conf done +# RPM macros +mkdir -p %{buildroot}%{rpmmacrodir} +install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ + # EPEL7 does not have python3-koji which is needed to run the tests, so there # is no point in running them %if ! 0%{?rhel} || 0%{?rhel} > 7 @@ -165,6 +181,9 @@ done %endif %changelog +* Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.0-1 +- Update to 0.1.0 + * Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.23-1 - Update to 0.023 diff --git a/sources b/sources index 9191ed7..d09dab7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.0.23.tar.gz) = 63be1c8477bb837795911d67fea24015df981fd75dc95051a87da5d0369f1cfece0280aa14ed92b358c4b4127080cb00d57105050e6a6521abd91df5312322bc +SHA512 (rpmautospec-0.1.0.tar.gz) = f4963faf34e4cbd70165d4fc80d20419f065c871bc9d0b6153514bb7442eb81efab38ad6a0b6117ae7872bd4bd8494247d8a09d343532e8fd5f8c5e26234ced6 From 36088d62c4d67660adb15350bd85a8d3b8a13d6c Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Thu, 9 Apr 2020 14:04:02 +0200 Subject: [PATCH 28/83] Update to 0.1.2 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 8 +++++++- sources | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 038cb2b..a629ffe 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.1.0 +Version: 0.1.2 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -181,6 +181,12 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.2-1 +- Update to 0.1.2 + +* Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.1-1 +- Update to 0.1.1 + * Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.0-1 - Update to 0.1.0 diff --git a/sources b/sources index d09dab7..60fa81d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.1.0.tar.gz) = f4963faf34e4cbd70165d4fc80d20419f065c871bc9d0b6153514bb7442eb81efab38ad6a0b6117ae7872bd4bd8494247d8a09d343532e8fd5f8c5e26234ced6 +SHA512 (rpmautospec-0.1.2.tar.gz) = 2b9d8e52074c8eee1539fbe3aaca2ef4b3f77d6f38c25b363ec3d5c27f7d5e9a6c5aa777c4dc90997b51529e2fc3d1998dfd7f41bc955dc69c95337ae7f14315 From eed19183b99d080953244ec5c3ae59a3d5709791 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Thu, 9 Apr 2020 15:23:51 +0200 Subject: [PATCH 29/83] Update to 0.1.3 Signed-off-by: Pierre-Yves Chibon --- python-rpmautospec.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index a629ffe..bef478d 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %endif Name: python-rpmautospec -Version: 0.1.2 +Version: 0.1.3 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -69,7 +69,7 @@ Requires: python3-%{srcname} = %{version}-%{release} # We add this require here and not in python3-rpmautospec because we do not want # it on the builders, the hub and builders plugins will work fine without it but # we need this in the chroot or when packagers run the CLI on their machines. -Requires: rpm-build +Requires: rpm-build >= 4.9 %description -n %{srcname} CLI tool for generating RPM releases and changelogs @@ -181,6 +181,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.3-1 +- Update to 0.1.3 + * Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.2-1 - Update to 0.1.2 diff --git a/sources b/sources index 60fa81d..3e1f90a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.1.2.tar.gz) = 2b9d8e52074c8eee1539fbe3aaca2ef4b3f77d6f38c25b363ec3d5c27f7d5e9a6c5aa777c4dc90997b51529e2fc3d1998dfd7f41bc955dc69c95337ae7f14315 +SHA512 (rpmautospec-0.1.3.tar.gz) = 29164ba5d71fcf0ac615daff1e4b598ebe2a01f7fd55747bb81fc3958c2b77c0364cc0973277ceacc2b8da2ab3630360a7c733ed06762e582db03555b080196a From f6823d261c9786bd7c75a686a50f5ce45c6bf74d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:38:06 +0200 Subject: [PATCH 30/83] Rebuilt for Python 3.9 --- python-rpmautospec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index bef478d..431cb0a 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -13,7 +13,7 @@ Name: python-rpmautospec Version: 0.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -181,6 +181,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Tue May 26 2020 Miro Hrončok - 0.1.3-2 +- Rebuilt for Python 3.9 + * Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.3-1 - Update to 0.1.3 From 8b519ac19dfbebfbec9d3aa643e47c1b06c45141 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 03:42:52 +0000 Subject: [PATCH 31/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-rpmautospec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 431cb0a..59f6709 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -13,7 +13,7 @@ Name: python-rpmautospec Version: 0.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -181,6 +181,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 0.1.3-2 - Rebuilt for Python 3.9 From ac9f9ffb4057a9ed218379afebe73f8c8b5a9266 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 13 Oct 2020 16:28:42 +0200 Subject: [PATCH 32/83] explicitly BR: python3-setuptools Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 59f6709..2fd0a19 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -13,7 +13,7 @@ Name: python-rpmautospec Version: 0.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -22,6 +22,7 @@ Source0: https://releases.pagure.org/Fedora-Infra/rpmautospec/rpmautospec BuildArch: noarch BuildRequires: python3-devel >= 3.6.0 +BuildRequires: python3-setuptools %if %{with epel_le_7} BuildRequires: python2-devel %endif @@ -181,6 +182,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Tue Oct 13 2020 Nils Philippsen - 0.1.3-4 +- explicitly BR: python3-setuptools + * Wed Jul 29 2020 Fedora Release Engineering - 0.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a1c1fd981ab9793a25326bcf7a4a5dbf820cc66d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 13:13:37 +0000 Subject: [PATCH 33/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-rpmautospec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 2fd0a19..441cee9 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -13,7 +13,7 @@ Name: python-rpmautospec Version: 0.1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -182,6 +182,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Oct 13 2020 Nils Philippsen - 0.1.3-4 - explicitly BR: python3-setuptools From 5affd15c31e2c8d0152d1958556278db5167647d Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 15 Apr 2021 12:43:21 +0200 Subject: [PATCH 34/83] Update to 0.1.5 Have lowercase URLs, because Pagure d'oh Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 22 +++++++++------------- sources | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 441cee9..7ecfd25 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,13 +12,13 @@ %endif Name: python-rpmautospec -Version: 0.1.3 -Release: 5%{?dist} +Version: 0.1.5 +Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT -URL: https://pagure.io/Fedora-Infra/rpmautospec -Source0: https://releases.pagure.org/Fedora-Infra/rpmautospec/rpmautospec-%{version}.tar.gz +URL: https://pagure.io/fedora-infra/rpmautospec +Source0: https://releases.pagure.org/fedora-infra/rpmautospec/rpmautospec-%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel >= 3.6.0 @@ -182,18 +182,14 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog -* Wed Jan 27 2021 Fedora Release Engineering - 0.1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Thu Apr 15 2021 Nils Philippsen - 0.1.5-1 +- Update to 0.1.5 +- Have lowercase URLs, because Pagure d'oh -* Tue Oct 13 2020 Nils Philippsen - 0.1.3-4 +* Thu Apr 15 2021 Nils Philippsen - 0.1.4-1 +- Update to 0.1.4 - explicitly BR: python3-setuptools -* Wed Jul 29 2020 Fedora Release Engineering - 0.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 0.1.3-2 -- Rebuilt for Python 3.9 - * Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.3-1 - Update to 0.1.3 diff --git a/sources b/sources index 3e1f90a..28338a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.1.3.tar.gz) = 29164ba5d71fcf0ac615daff1e4b598ebe2a01f7fd55747bb81fc3958c2b77c0364cc0973277ceacc2b8da2ab3630360a7c733ed06762e582db03555b080196a +SHA512 (rpmautospec-0.1.5.tar.gz) = 056a6f06a1d7d999eddb704f6847c38508b02b231b23b848f1a78f2eaece7cc2bfd1d6bba8721fa84baf41dadc9af9f8f8485456eeeeae868aecb263ef5e957d From 9a30a91e7fdc42099d6675938ca089feef18859b Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 27 May 2021 17:25:34 +0200 Subject: [PATCH 35/83] Update to 0.2.0 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 82 ++++++++++++++--------------------------- sources | 2 +- 2 files changed, 29 insertions(+), 55 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 7ecfd25..e5b8ad8 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -1,7 +1,6 @@ %global srcname rpmautospec -# Up to EL7, the Koji hub plugin is run under Python 2.x and Python files in private directories -# would be byte-compiled. +# Up to EL7, Python files in private directories would be byte-compiled. %if ! 0%{?rhel} || 0%{?rhel} > 7 %bcond_with epel_le_7 %else @@ -12,7 +11,7 @@ %endif Name: python-rpmautospec -Version: 0.1.5 +Version: 0.2.0 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -32,11 +31,15 @@ BuildRequires: python2-devel %if ! %{with epel_le_7} BuildRequires: koji BuildRequires: python3-koji +BuildRequires: python3-pygit2 BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-pytest-cov BuildRequires: git %endif +Obsoletes: koji-hub-plugin-rpmautospec < 0.1.5-2 +Conflicts: koji-hub-plugin-rpmautospec < 0.1.5-2 + %global _description %{expand: A package and CLI tool to generate RPM release fields and changelogs.} @@ -49,9 +52,11 @@ Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} Requires: koji -Requires: git-core -Requires: python3-rpm Requires: python3-koji +Requires: python3-pygit2 +Requires: rpm +# for "rpm --specfile" +Requires: rpm-build >= 4.9 %description -n python3-%{srcname} %_description @@ -67,10 +72,6 @@ Requires: python3-koji %package -n %{srcname} Summary: CLI tool for generating RPM releases and changelogs Requires: python3-%{srcname} = %{version}-%{release} -# We add this require here and not in python3-rpmautospec because we do not want -# it on the builders, the hub and builders plugins will work fine without it but -# we need this in the chroot or when packagers run the CLI on their machines. -Requires: rpm-build >= 4.9 %description -n %{srcname} CLI tool for generating RPM releases and changelogs @@ -92,27 +93,6 @@ A Koji plugin for generating RPM releases and changelogs. %files -n koji-builder-plugin-rpmautospec %{_prefix}/lib/koji-builder-plugins/* -%config(noreplace) %{_sysconfdir}/kojid/plugins/rpmautospec.conf - -%package -n koji-hub-plugin-rpmautospec -Summary: Koji plugin for tagging successful builds in dist-git -%if ! %{with epel_le_7} -Requires: python3-%{srcname} = %{version}-%{release} -Requires: python3-koji -%endif -Requires: koji-hub-plugins - -%description -n koji-hub-plugin-rpmautospec -A Koji plugin for tagging successful builds in their dist-git repository. - -%files -n koji-hub-plugin-rpmautospec -%if %{with epel_le_7} -%{python2_sitelib}/rpmautospec/ -%endif -%{_prefix}/lib/koji-hub-plugins/* - -%config(noreplace) %{_sysconfdir}/koji-hub/plugins/rpmautospec.conf - # Package the placeholder rpm-macros %package -n rpmautospec-rpm-macros @@ -138,38 +118,17 @@ sed -i /koji/d requirements.txt %install %py3_install -for plugin_type in builder hub; do - mkdir -p %{buildroot}%{_prefix}/lib/koji-${plugin_type}-plugins/ - install -m 0644 koji_plugins/rpmautospec_${plugin_type}.py \ - %{buildroot}%{_prefix}/lib/koji-${plugin_type}-plugins/ -done +mkdir -p %{buildroot}%{_prefix}/lib/koji-builder-plugins/ +install -m 0644 koji_plugins/rpmautospec_builder.py \ + %{buildroot}%{_prefix}/lib/koji-builder-plugins/ %if %{with epel_le_7} -# the hub-plugin py2 tagging library -# Install the py2compat files to the koji-hub-plugin -mkdir -p %{buildroot}%{python2_sitelib}/rpmautospec/py2compat/ -touch %{buildroot}%{python2_sitelib}/rpmautospec/__init__.py \ - %{buildroot}%{python2_sitelib}/rpmautospec/py2compat/__init__.py -install -m 0644 rpmautospec/py2compat/tagging.py \ - %{buildroot}%{python2_sitelib}/rpmautospec/py2compat/ - # EL <= 7: Byte-compile all the things %py_byte_compile %{python3} %{buildroot}%{python3_sitelib} %py_byte_compile %{python2} %{buildroot}%{python2_sitelib} -%py_byte_compile %{python2} %{buildroot}%{_prefix}/lib/koji-hub-plugins/ -%else -# EL > 7, Fedora -%py_byte_compile %{python3} %{buildroot}%{_prefix}/lib/koji-hub-plugins/ %endif %py_byte_compile %{python3} %{buildroot}%{_prefix}/lib/koji-builder-plugins/ -# configuration shared by the plugins -for dest in kojid koji-hub; do - mkdir -p %{buildroot}%{_sysconfdir}/$dest/plugins/ - install -m 0644 koji_plugins/rpmautospec.conf \ - %{buildroot}%{_sysconfdir}/$dest/plugins/rpmautospec.conf -done - # RPM macros mkdir -p %{buildroot}%{rpmmacrodir} install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ @@ -182,6 +141,21 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Thu May 27 2021 Stephen Coady - 0.2.0-1 +- Update to 0.2.0 + +* Thu May 27 2021 Nils Philippsen +- don't ship obsolete Koji configuration snippet + +* Wed May 19 2021 Nils Philippsen +- remove git-core, fix RPM related dependencies + +* Wed May 12 2021 Nils Philippsen +- depend on python3-pygit2 + +* Thu Apr 22 2021 Nils Philippsen +- remove the hub plugin + * Thu Apr 15 2021 Nils Philippsen - 0.1.5-1 - Update to 0.1.5 - Have lowercase URLs, because Pagure d'oh diff --git a/sources b/sources index 28338a5..4844873 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.1.5.tar.gz) = 056a6f06a1d7d999eddb704f6847c38508b02b231b23b848f1a78f2eaece7cc2bfd1d6bba8721fa84baf41dadc9af9f8f8485456eeeeae868aecb263ef5e957d +SHA512 (rpmautospec-0.2.0.tar.gz) = 29d976beda60e59f58d2a37fb6cb86f1860b0035f70e5b8ee705dbb69935b7beb7b9d744f6a92eb1ee036e90c6773a2edd1ac9f597d38b23641617ca814c074f From bf888809611dd4542b68f54f297ce8b628c0dabf Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 27 May 2021 17:45:54 +0200 Subject: [PATCH 36/83] Update to 0.2.1 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index e5b8ad8..b648855 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -11,7 +11,7 @@ %endif Name: python-rpmautospec -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -141,6 +141,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Thu May 27 2021 Nils Philippsen - 0.2.1-1 +- Update to 0.2.1 + * Thu May 27 2021 Stephen Coady - 0.2.0-1 - Update to 0.2.0 diff --git a/sources b/sources index 4844873..aadd6ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.2.0.tar.gz) = 29d976beda60e59f58d2a37fb6cb86f1860b0035f70e5b8ee705dbb69935b7beb7b9d744f6a92eb1ee036e90c6773a2edd1ac9f597d38b23641617ca814c074f +SHA512 (rpmautospec-0.2.1.tar.gz) = e455890bafc5179ce21002f914ad6e9423357865f4324e8d237c9b20f3b98c1f9416303c97a772a9512fb8b62acf7e2bbc5de27d5edc4aaef9b39f75a169d3ab From fd8ed81c06e1723ca23128d8ae6aec0e2bebc82b Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 4 Jun 2021 15:59:12 +0200 Subject: [PATCH 37/83] Update to 0.2.2 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index b648855..7ea239c 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -11,7 +11,7 @@ %endif Name: python-rpmautospec -Version: 0.2.1 +Version: 0.2.2 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -141,6 +141,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Fri Jun 04 2021 Nils Philippsen - 0.2.2-1 +- Update to 0.2.2 + * Thu May 27 2021 Nils Philippsen - 0.2.1-1 - Update to 0.2.1 diff --git a/sources b/sources index aadd6ab..ad6a2b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.2.1.tar.gz) = e455890bafc5179ce21002f914ad6e9423357865f4324e8d237c9b20f3b98c1f9416303c97a772a9512fb8b62acf7e2bbc5de27d5edc4aaef9b39f75a169d3ab +SHA512 (rpmautospec-0.2.2.tar.gz) = 8677e4b4f4db3fe765682954c74fe2873d6343943a76d38491bd8c914a428c85e884ffa8cdc229cba2ce37550a3f4c1a43b5e523ef952b7435071050abb54491 From ff7486f538c74732fcac32b8e70402a2dc24205b Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 4 Jun 2021 16:23:27 +0200 Subject: [PATCH 38/83] Bump the release due to the f34-infra build Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 7ea239c..e05249e 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ Name: python-rpmautospec Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -141,7 +141,7 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog -* Fri Jun 04 2021 Nils Philippsen - 0.2.2-1 +* Fri Jun 04 2021 Nils Philippsen - 0.2.2-2 - Update to 0.2.2 * Thu May 27 2021 Nils Philippsen - 0.2.1-1 From 41d94e0e84faed76ce57b012f8cbc10eb5ac3add Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:59:59 +0200 Subject: [PATCH 39/83] Rebuilt for Python 3.10 --- python-rpmautospec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index e05249e..e9cf305 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ Name: python-rpmautospec Version: 0.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -141,6 +141,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Fri Jun 04 2021 Python Maint - 0.2.2-3 +- Rebuilt for Python 3.10 + * Fri Jun 04 2021 Nils Philippsen - 0.2.2-2 - Update to 0.2.2 From 4e2c8a90441336c3f2c84603818056d15f6ecbc2 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 16 Jun 2021 13:32:43 +0200 Subject: [PATCH 40/83] Update to 0.2.3 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 10 +++++----- sources | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index e9cf305..57d9f9e 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -11,8 +11,8 @@ %endif Name: python-rpmautospec -Version: 0.2.2 -Release: 3%{?dist} +Version: 0.2.3 +Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -141,10 +141,10 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog -* Fri Jun 04 2021 Python Maint - 0.2.2-3 -- Rebuilt for Python 3.10 +* Wed Jun 16 2021 Nils Philippsen - 0.2.3-1 +- Update to 0.2.3 -* Fri Jun 04 2021 Nils Philippsen - 0.2.2-2 +* Fri Jun 04 2021 Nils Philippsen - 0.2.2-1 - Update to 0.2.2 * Thu May 27 2021 Nils Philippsen - 0.2.1-1 diff --git a/sources b/sources index ad6a2b5..8f235af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.2.2.tar.gz) = 8677e4b4f4db3fe765682954c74fe2873d6343943a76d38491bd8c914a428c85e884ffa8cdc229cba2ce37550a3f4c1a43b5e523ef952b7435071050abb54491 +SHA512 (rpmautospec-0.2.3.tar.gz) = 497cefe05f1f5d28f7dac63337fa8d591c6df8132de1b8da0c3b6acfd273be5e066bce27d20a3bc3b3648100bcedc783608ec6b0e8f3621a9167f053b4acac3e From 509e1b6a7f9daa2146bf20f848176462424fbab3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 09:18:45 +0000 Subject: [PATCH 41/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-rpmautospec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 57d9f9e..35951d2 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ Name: python-rpmautospec Version: 0.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -141,6 +141,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jun 16 2021 Nils Philippsen - 0.2.3-1 - Update to 0.2.3 From 661272289dc1b4be8ab415dfd7bafb6110a0ad2c Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 5 Aug 2021 21:33:46 +0200 Subject: [PATCH 42/83] Update to 0.2.4 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 35951d2..82911b4 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -11,8 +11,8 @@ %endif Name: python-rpmautospec -Version: 0.2.3 -Release: 2%{?dist} +Version: 0.2.4 +Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -141,8 +141,8 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog -* Fri Jul 23 2021 Fedora Release Engineering - 0.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Thu Aug 05 2021 Nils Philippsen - 0.2.4-1 +- Update to 0.2.4 * Wed Jun 16 2021 Nils Philippsen - 0.2.3-1 - Update to 0.2.3 diff --git a/sources b/sources index 8f235af..6933b2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.2.3.tar.gz) = 497cefe05f1f5d28f7dac63337fa8d591c6df8132de1b8da0c3b6acfd273be5e066bce27d20a3bc3b3648100bcedc783608ec6b0e8f3621a9167f053b4acac3e +SHA512 (rpmautospec-0.2.4.tar.gz) = c033012614ebc38b5b88ea2a501e81e00460806032dfdc1565fd9d70d6c70640e764c34ab3a5df583a82b1e6acf977bdcdebdec2b270267918a9392c7edde317 From d5b30d5351353dbe7e1545e9c123d2206aa01a1c Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 6 Aug 2021 17:39:45 +0200 Subject: [PATCH 43/83] Update to 0.2.5 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 82911b4..942eaf8 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -11,7 +11,7 @@ %endif Name: python-rpmautospec -Version: 0.2.4 +Version: 0.2.5 Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs @@ -141,6 +141,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Fri Aug 06 2021 Nils Philippsen - 0.2.5-1 +- Update to 0.2.5 + * Thu Aug 05 2021 Nils Philippsen - 0.2.4-1 - Update to 0.2.4 diff --git a/sources b/sources index 6933b2e..b0084fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.2.4.tar.gz) = c033012614ebc38b5b88ea2a501e81e00460806032dfdc1565fd9d70d6c70640e764c34ab3a5df583a82b1e6acf977bdcdebdec2b270267918a9392c7edde317 +SHA512 (rpmautospec-0.2.5.tar.gz) = a101e3eca72ad47cca12972bd1459d3cc4b957c1e234c073de0261162dce78b77a873afc337a3d3ab135c9fdf4cd5c021012e52aab0cbaa6c313c0d9bfa03044 From cd85a77a4f21b5e58d9a8dcf6a865dc57b59ccd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 15:19:25 +0000 Subject: [PATCH 44/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-rpmautospec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 942eaf8..f0049c2 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ Name: python-rpmautospec Version: 0.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -141,6 +141,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 0.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Aug 06 2021 Nils Philippsen - 0.2.5-1 - Update to 0.2.5 From b8a3210b4e3a7ca7b073da2306fc17112b180fce Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 25 Apr 2022 14:12:32 +0200 Subject: [PATCH 45/83] Update to 0.2.6 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 54 ++++++++++++++++------------------------- sources | 2 +- 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index f0049c2..05317ec 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -1,18 +1,8 @@ %global srcname rpmautospec -# Up to EL7, Python files in private directories would be byte-compiled. -%if ! 0%{?rhel} || 0%{?rhel} > 7 -%bcond_with epel_le_7 -%else -%bcond_without epel_le_7 -# We don't want to byte-compile Python files in private directories, i.e. the Koji plugins. As a -# side effect, this doesn't byte-compile Python files in the system locations either, huzzah! -%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') -%endif - Name: python-rpmautospec -Version: 0.2.5 -Release: 2%{?dist} +Version: 0.2.6 +Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -20,22 +10,20 @@ URL: https://pagure.io/fedora-infra/rpmautospec Source0: https://releases.pagure.org/fedora-infra/rpmautospec/rpmautospec-%{version}.tar.gz BuildArch: noarch +BuildRequires: git +# the langpacks are needed for tests +BuildRequires: glibc-langpack-de +BuildRequires: glibc-langpack-en BuildRequires: python3-devel >= 3.6.0 BuildRequires: python3-setuptools -%if %{with epel_le_7} -BuildRequires: python2-devel -%endif -# EPEL7 does not have python3-koji and the other dependencies here are only -# needed in the buildroot for the tests, which can't run because of the lack of -# python3-koji -%if ! %{with epel_le_7} BuildRequires: koji +BuildRequires: python%{python3_pkgversion}-babel BuildRequires: python3-koji BuildRequires: python3-pygit2 BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-pytest-cov -BuildRequires: git -%endif +BuildRequires: python%{python3_pkgversion}-pytest-xdist +BuildRequires: python%{python3_pkgversion}-pyyaml Obsoletes: koji-hub-plugin-rpmautospec < 0.1.5-2 Conflicts: koji-hub-plugin-rpmautospec < 0.1.5-2 @@ -52,6 +40,7 @@ Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} Requires: koji +Requires: python3-babel Requires: python3-koji Requires: python3-pygit2 Requires: rpm @@ -122,27 +111,26 @@ mkdir -p %{buildroot}%{_prefix}/lib/koji-builder-plugins/ install -m 0644 koji_plugins/rpmautospec_builder.py \ %{buildroot}%{_prefix}/lib/koji-builder-plugins/ -%if %{with epel_le_7} -# EL <= 7: Byte-compile all the things -%py_byte_compile %{python3} %{buildroot}%{python3_sitelib} -%py_byte_compile %{python2} %{buildroot}%{python2_sitelib} -%endif %py_byte_compile %{python3} %{buildroot}%{_prefix}/lib/koji-builder-plugins/ # RPM macros mkdir -p %{buildroot}%{rpmmacrodir} install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ -# EPEL7 does not have python3-koji which is needed to run the tests, so there -# is no point in running them -%if ! 0%{?rhel} || 0%{?rhel} > 7 %check -%{__python3} -m pytest -%endif +%{__python3} -m pytest -n auto %changelog -* Fri Jan 21 2022 Fedora Release Engineering - 0.2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Mon Apr 25 2022 Nils Philippsen - 0.2.6-1 +- Update to 0.2.6 +- Require python3-pytest-xdist for building +- Remove EL7 quirks, pkg isn't built there + +* Fri Mar 04 2022 Nils Philippsen +- require python3-pyyaml for building + +* Sun Nov 07 2021 Nils Philippsen +- require python3-babel and glibc langpacks (the latter for testing) * Fri Aug 06 2021 Nils Philippsen - 0.2.5-1 - Update to 0.2.5 diff --git a/sources b/sources index b0084fd..fcc9b67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.2.5.tar.gz) = a101e3eca72ad47cca12972bd1459d3cc4b957c1e234c073de0261162dce78b77a873afc337a3d3ab135c9fdf4cd5c021012e52aab0cbaa6c313c0d9bfa03044 +SHA512 (rpmautospec-0.2.6.tar.gz) = bd76faee8c4bb7f14fa1f23876f67c89c073c3b486681b3db550e1a42328a399d8a428927300c26c82c32533c2a43a221278c3547a194592ab60787f160ec37a From 3722993fc0f18611cdca6a3af5593375ce3d13ff Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sun, 15 May 2022 13:38:39 +0200 Subject: [PATCH 46/83] Don't BR: python3-pytest-xdist on EL9 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 05317ec..2a11420 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -1,8 +1,15 @@ +# when bootstrapping Python, pytest-xdist is not yet available (also not yet in EPEL9) +%if ! 0%{?rhel} || 0%{?rhel} > 9 +%bcond_without xdist +%else +%bcond_with xdist +%endif + %global srcname rpmautospec Name: python-rpmautospec Version: 0.2.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -22,7 +29,9 @@ BuildRequires: python3-koji BuildRequires: python3-pygit2 BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-pytest-cov +%if %{with xdist} BuildRequires: python%{python3_pkgversion}-pytest-xdist +%endif BuildRequires: python%{python3_pkgversion}-pyyaml Obsoletes: koji-hub-plugin-rpmautospec < 0.1.5-2 @@ -118,9 +127,16 @@ mkdir -p %{buildroot}%{rpmmacrodir} install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %check -%{__python3} -m pytest -n auto +%{__python3} -m pytest \ +%if %{with xdist} +--numprocesses=auto +%endif + %changelog +* Sun May 15 2022 Nils Philippsen - 0.2.6-2 +- Don't require python3-pytest-xdist for building on EL9 + * Mon Apr 25 2022 Nils Philippsen - 0.2.6-1 - Update to 0.2.6 - Require python3-pytest-xdist for building From 9988d845be7684c567129acc32e68747634ddf8f Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 16 May 2022 18:25:27 +0200 Subject: [PATCH 47/83] Update to 0.2.8 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 2a11420..007f84a 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -8,8 +8,8 @@ %global srcname rpmautospec Name: python-rpmautospec -Version: 0.2.6 -Release: 2%{?dist} +Version: 0.2.8 +Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -134,9 +134,13 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %changelog -* Sun May 15 2022 Nils Philippsen - 0.2.6-2 +* Mon May 16 2022 Nils Philippsen - 0.2.8-1 +- Update to 0.2.8 - Don't require python3-pytest-xdist for building on EL9 +* Mon May 16 2022 Nils Philippsen - 0.2.7-1 +- Update to 0.2.7 + * Mon Apr 25 2022 Nils Philippsen - 0.2.6-1 - Update to 0.2.6 - Require python3-pytest-xdist for building diff --git a/sources b/sources index fcc9b67..420bd36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.2.6.tar.gz) = bd76faee8c4bb7f14fa1f23876f67c89c073c3b486681b3db550e1a42328a399d8a428927300c26c82c32533c2a43a221278c3547a194592ab60787f160ec37a +SHA512 (rpmautospec-0.2.8.tar.gz) = 4584e876339dcfc057bc5bea1ebf8f3aaf8a2cf439b44fd2b6089d6297fc048a66c66875de8472281656f42ae331247e2b39279d3585f97a7f491cc4093c6e0f From fe54ae47dc1af8f2480d9b89bf406ad7f69b6b26 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 16 Jun 2022 19:46:04 +0200 Subject: [PATCH 48/83] Rebuilt for Python 3.11 --- python-rpmautospec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 007f84a..a0f8a3f 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -9,7 +9,7 @@ Name: python-rpmautospec Version: 0.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -134,6 +134,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %changelog +* Thu Jun 16 2022 Python Maint - 0.2.8-2 +- Rebuilt for Python 3.11 + * Mon May 16 2022 Nils Philippsen - 0.2.8-1 - Update to 0.2.8 - Don't require python3-pytest-xdist for building on EL9 From ffcbb66a865dd4a9864e8471345532b7c7ef9d1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 22:07:30 +0000 Subject: [PATCH 49/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-rpmautospec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index a0f8a3f..d60d857 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -9,7 +9,7 @@ Name: python-rpmautospec Version: 0.2.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -134,6 +134,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 0.2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jun 16 2022 Python Maint - 0.2.8-2 - Rebuilt for Python 3.11 From bd4b3fc0f7a5b6aaf686e0f7392db883892221a2 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 27 Jul 2022 11:53:35 +0200 Subject: [PATCH 50/83] Generally BR: python3-pytest-xdist, also on EL9 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index d60d857..c7e6542 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -1,9 +1,5 @@ -# when bootstrapping Python, pytest-xdist is not yet available (also not yet in EPEL9) -%if ! 0%{?rhel} || 0%{?rhel} > 9 +# when bootstrapping Python, pytest-xdist is not yet available %bcond_without xdist -%else -%bcond_with xdist -%endif %global srcname rpmautospec @@ -134,11 +130,8 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %changelog -* Fri Jul 22 2022 Fedora Release Engineering - 0.2.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jun 16 2022 Python Maint - 0.2.8-2 -- Rebuilt for Python 3.11 +* Wed Jun 08 2022 Nils Philippsen +- Generally BR: python3-pytest-xdist, also on EL9 * Mon May 16 2022 Nils Philippsen - 0.2.8-1 - Update to 0.2.8 From 80b09cdf6ed2ee3cb771a91dbfb6a1c54a5eef5d Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 27 Jul 2022 11:54:16 +0200 Subject: [PATCH 51/83] Update to 0.3.0 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index c7e6542..6849e43 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -4,8 +4,8 @@ %global srcname rpmautospec Name: python-rpmautospec -Version: 0.2.8 -Release: 3%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -130,6 +130,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %changelog +* Wed Jul 27 2022 Nils Philippsen - 0.3.0-1 +- Update to 0.3.0 + * Wed Jun 08 2022 Nils Philippsen - Generally BR: python3-pytest-xdist, also on EL9 diff --git a/sources b/sources index 420bd36..2737497 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.2.8.tar.gz) = 4584e876339dcfc057bc5bea1ebf8f3aaf8a2cf439b44fd2b6089d6297fc048a66c66875de8472281656f42ae331247e2b39279d3585f97a7f491cc4093c6e0f +SHA512 (rpmautospec-0.3.0.tar.gz) = 2d4ef9ea79b75bffde4ef2935cbf38843d4426f795762c1abf183dbbc8e27fd7eaa8d820560555bfdb4aaed66fd5f14925737fc18dfccf492241cab828e28097 From d1e6485de70d178df87a171248b16c26f344ea06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 10 Nov 2022 10:04:59 +0100 Subject: [PATCH 52/83] Convert to rpmautospec Fixes https://pagure.io/fedora-infra/rpmautospec/issue/187 --- changelog | 142 +++++++++++++++++++++++++++++++++++++++ python-rpmautospec.spec | 145 +--------------------------------------- 2 files changed, 144 insertions(+), 143 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..0045fa6 --- /dev/null +++ b/changelog @@ -0,0 +1,142 @@ +* Wed Jul 27 2022 Nils Philippsen - 0.3.0-1 +- Update to 0.3.0 + +* Wed Jun 08 2022 Nils Philippsen +- Generally BR: python3-pytest-xdist, also on EL9 + +* Mon May 16 2022 Nils Philippsen - 0.2.8-1 +- Update to 0.2.8 +- Don't require python3-pytest-xdist for building on EL9 + +* Mon May 16 2022 Nils Philippsen - 0.2.7-1 +- Update to 0.2.7 + +* Mon Apr 25 2022 Nils Philippsen - 0.2.6-1 +- Update to 0.2.6 +- Require python3-pytest-xdist for building +- Remove EL7 quirks, pkg isn't built there + +* Fri Mar 04 2022 Nils Philippsen +- require python3-pyyaml for building + +* Sun Nov 07 2021 Nils Philippsen +- require python3-babel and glibc langpacks (the latter for testing) + +* Fri Aug 06 2021 Nils Philippsen - 0.2.5-1 +- Update to 0.2.5 + +* Thu Aug 05 2021 Nils Philippsen - 0.2.4-1 +- Update to 0.2.4 + +* Wed Jun 16 2021 Nils Philippsen - 0.2.3-1 +- Update to 0.2.3 + +* Fri Jun 04 2021 Nils Philippsen - 0.2.2-1 +- Update to 0.2.2 + +* Thu May 27 2021 Nils Philippsen - 0.2.1-1 +- Update to 0.2.1 + +* Thu May 27 2021 Stephen Coady - 0.2.0-1 +- Update to 0.2.0 + +* Thu May 27 2021 Nils Philippsen +- don't ship obsolete Koji configuration snippet + +* Wed May 19 2021 Nils Philippsen +- remove git-core, fix RPM related dependencies + +* Wed May 12 2021 Nils Philippsen +- depend on python3-pygit2 + +* Thu Apr 22 2021 Nils Philippsen +- remove the hub plugin + +* Thu Apr 15 2021 Nils Philippsen - 0.1.5-1 +- Update to 0.1.5 +- Have lowercase URLs, because Pagure d'oh + +* Thu Apr 15 2021 Nils Philippsen - 0.1.4-1 +- Update to 0.1.4 +- explicitly BR: python3-setuptools + +* Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.3-1 +- Update to 0.1.3 + +* Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.2-1 +- Update to 0.1.2 + +* Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.1-1 +- Update to 0.1.1 + +* Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.0-1 +- Update to 0.1.0 + +* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.23-1 +- Update to 0.023 + +* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.22-1 +- Update to 0.0.22 + +* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.21-1 +- Update to 0.0.21 + +* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.20-1 +- Update to 0.0.20 + +* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.19-1 +- Update to 0.0.19 + +* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.18-1 +- Update to 0.0.18 + +* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.17-1 +- Update to 0.0.17 + +* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.16-1 +- Update to 0.0.16 + +* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.15-1 +- Update to 0.0.15 + +* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.14-1 +- Update to 0.0.14 + +* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.13-1 +- Update to 0.0.13 + +* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.12-1 +- Update to 0.0.12 + +* Mon Apr 06 2020 Pierre-Yves Chibon - 0.0.11-1 +- Update to 0.0.11 + +* Fri Apr 03 2020 Nils Philippsen - 0.0.10-1 +- Update to 0.0.10 + +* Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.9-1 +- Update to 0.0.9 + +* Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.8-1 +- Update to 0.0.8 + +* Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.7-1 +- Update to 0.0.7 + +* Thu Apr 02 2020 Pierre-Yves Chibon - 0.0.6-1 +- Update to 0.0.6 + +* Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.5-1 +- Update to 0.0.5 + +* Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.4-1 +- Update to 0.0.4 + +* Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.3-1 +- Update to 0.0.3 + +* Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.2-1 +- Update to 0.0.2 + +* Wed Mar 18 2020 Adam Saleh - 0.0.1-1 +- initial package for Fedora diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 6849e43..8c44cb0 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -5,7 +5,7 @@ Name: python-rpmautospec Version: 0.3.0 -Release: 1%{?dist} +Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -130,145 +130,4 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %changelog -* Wed Jul 27 2022 Nils Philippsen - 0.3.0-1 -- Update to 0.3.0 - -* Wed Jun 08 2022 Nils Philippsen -- Generally BR: python3-pytest-xdist, also on EL9 - -* Mon May 16 2022 Nils Philippsen - 0.2.8-1 -- Update to 0.2.8 -- Don't require python3-pytest-xdist for building on EL9 - -* Mon May 16 2022 Nils Philippsen - 0.2.7-1 -- Update to 0.2.7 - -* Mon Apr 25 2022 Nils Philippsen - 0.2.6-1 -- Update to 0.2.6 -- Require python3-pytest-xdist for building -- Remove EL7 quirks, pkg isn't built there - -* Fri Mar 04 2022 Nils Philippsen -- require python3-pyyaml for building - -* Sun Nov 07 2021 Nils Philippsen -- require python3-babel and glibc langpacks (the latter for testing) - -* Fri Aug 06 2021 Nils Philippsen - 0.2.5-1 -- Update to 0.2.5 - -* Thu Aug 05 2021 Nils Philippsen - 0.2.4-1 -- Update to 0.2.4 - -* Wed Jun 16 2021 Nils Philippsen - 0.2.3-1 -- Update to 0.2.3 - -* Fri Jun 04 2021 Nils Philippsen - 0.2.2-1 -- Update to 0.2.2 - -* Thu May 27 2021 Nils Philippsen - 0.2.1-1 -- Update to 0.2.1 - -* Thu May 27 2021 Stephen Coady - 0.2.0-1 -- Update to 0.2.0 - -* Thu May 27 2021 Nils Philippsen -- don't ship obsolete Koji configuration snippet - -* Wed May 19 2021 Nils Philippsen -- remove git-core, fix RPM related dependencies - -* Wed May 12 2021 Nils Philippsen -- depend on python3-pygit2 - -* Thu Apr 22 2021 Nils Philippsen -- remove the hub plugin - -* Thu Apr 15 2021 Nils Philippsen - 0.1.5-1 -- Update to 0.1.5 -- Have lowercase URLs, because Pagure d'oh - -* Thu Apr 15 2021 Nils Philippsen - 0.1.4-1 -- Update to 0.1.4 -- explicitly BR: python3-setuptools - -* Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.3-1 -- Update to 0.1.3 - -* Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.2-1 -- Update to 0.1.2 - -* Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.1-1 -- Update to 0.1.1 - -* Thu Apr 09 2020 Pierre-Yves Chibon - 0.1.0-1 -- Update to 0.1.0 - -* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.23-1 -- Update to 0.023 - -* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.22-1 -- Update to 0.0.22 - -* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.21-1 -- Update to 0.0.21 - -* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.20-1 -- Update to 0.0.20 - -* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.19-1 -- Update to 0.0.19 - -* Wed Apr 08 2020 Pierre-Yves Chibon - 0.0.18-1 -- Update to 0.0.18 - -* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.17-1 -- Update to 0.0.17 - -* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.16-1 -- Update to 0.0.16 - -* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.15-1 -- Update to 0.0.15 - -* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.14-1 -- Update to 0.0.14 - -* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.13-1 -- Update to 0.0.13 - -* Tue Apr 07 2020 Pierre-Yves Chibon - 0.0.12-1 -- Update to 0.0.12 - -* Mon Apr 06 2020 Pierre-Yves Chibon - 0.0.11-1 -- Update to 0.0.11 - -* Fri Apr 03 2020 Nils Philippsen - 0.0.10-1 -- Update to 0.0.10 - -* Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.9-1 -- Update to 0.0.9 - -* Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.8-1 -- Update to 0.0.8 - -* Fri Apr 03 2020 Pierre-Yves Chibon - 0.0.7-1 -- Update to 0.0.7 - -* Thu Apr 02 2020 Pierre-Yves Chibon - 0.0.6-1 -- Update to 0.0.6 - -* Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.5-1 -- Update to 0.0.5 - -* Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.4-1 -- Update to 0.0.4 - -* Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.3-1 -- Update to 0.0.3 - -* Tue Mar 31 2020 Pierre-Yves Chibon - 0.0.2-1 -- Update to 0.0.2 - -* Wed Mar 18 2020 Adam Saleh - 0.0.1-1 -- initial package for Fedora +%autochangelog From 8727dbcb83018e3e0e7391d1078f30dd7571249b Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 11 Nov 2022 19:41:29 +0100 Subject: [PATCH 53/83] Update to 0.3.1 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 8c44cb0..5338b49 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -4,7 +4,7 @@ %global srcname rpmautospec Name: python-rpmautospec -Version: 0.3.0 +Version: 0.3.1 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs diff --git a/sources b/sources index 2737497..aa875f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.3.0.tar.gz) = 2d4ef9ea79b75bffde4ef2935cbf38843d4426f795762c1abf183dbbc8e27fd7eaa8d820560555bfdb4aaed66fd5f14925737fc18dfccf492241cab828e28097 +SHA512 (rpmautospec-0.3.1.tar.gz) = 2bde506827729c57006191e7533a097b6307b487b10dcc84bc0fc5693fdb3ce35cfb70d5f970f158feebe5503a353e46a4f113bc44a4f82bec0df08c16ef5655 From 38ca9973c88020b2ad06bc95391a68330c449539 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 17:04:10 +0000 Subject: [PATCH 54/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f962a0a03a03eaa6ee329da28e68a2e063e3bb90 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 24 Jan 2023 16:43:09 +0100 Subject: [PATCH 55/83] Update to 0.3.2 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 5338b49..6ae5e9c 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -4,7 +4,7 @@ %global srcname rpmautospec Name: python-rpmautospec -Version: 0.3.1 +Version: 0.3.2 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs diff --git a/sources b/sources index aa875f7..3cf5205 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.3.1.tar.gz) = 2bde506827729c57006191e7533a097b6307b487b10dcc84bc0fc5693fdb3ce35cfb70d5f970f158feebe5503a353e46a4f113bc44a4f82bec0df08c16ef5655 +SHA512 (rpmautospec-0.3.2.tar.gz) = 1e5e9ac1e73813222205fa6a3d5909e4caec5990906a5a1601aee2614f1e14fee64aa78e05bf47d774fb0e1005efbad1c35a96183ac1397c16e448ce0a921d54 From 2ca7d51a4c3086b09423ab613a636076c2e4b1a9 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 8 Feb 2023 19:26:37 +0100 Subject: [PATCH 56/83] Update to 0.3.3 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 6ae5e9c..2d32e92 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -4,7 +4,7 @@ %global srcname rpmautospec Name: python-rpmautospec -Version: 0.3.2 +Version: 0.3.3 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs diff --git a/sources b/sources index 3cf5205..159629d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.3.2.tar.gz) = 1e5e9ac1e73813222205fa6a3d5909e4caec5990906a5a1601aee2614f1e14fee64aa78e05bf47d774fb0e1005efbad1c35a96183ac1397c16e448ce0a921d54 +SHA512 (rpmautospec-0.3.3.tar.gz) = e4ceeec46ddfbb73e88a0e943f7b35933a7f4e2e2e8a8b4d281f8935c07799aadbb89f34c19390b3f69aec3ed2a03aa269f108da2c0b1c8169919d0096496257 From e8412c2b1695180be45301840b535e3a47df6b2a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 8 Feb 2023 20:22:19 +0100 Subject: [PATCH 57/83] Update to 0.3.4 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 3 ++- sources | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 2d32e92..95961ec 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -4,7 +4,7 @@ %global srcname rpmautospec Name: python-rpmautospec -Version: 0.3.3 +Version: 0.3.4 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs @@ -123,6 +123,7 @@ mkdir -p %{buildroot}%{rpmmacrodir} install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %check +PYTHONPATH="%{buildroot}%{python3_sitelib}" \ %{__python3} -m pytest \ %if %{with xdist} --numprocesses=auto diff --git a/sources b/sources index 159629d..eec854e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.3.3.tar.gz) = e4ceeec46ddfbb73e88a0e943f7b35933a7f4e2e2e8a8b4d281f8935c07799aadbb89f34c19390b3f69aec3ed2a03aa269f108da2c0b1c8169919d0096496257 +SHA512 (rpmautospec-0.3.4.tar.gz) = fcca7b30e76ac9e8cef72e35a2707937d94fac3ce13d925f6f0f9ae64e6a48ce7660d4160606b540c40bdfdb1699e195ca442a070d40271198a724223c979c42 From 89185d008a0c30f7a15a3eda8c11cdd1f3e17b6e Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 8 Feb 2023 20:51:26 +0100 Subject: [PATCH 58/83] Update to 0.3.5 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 95961ec..24e4503 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -4,7 +4,7 @@ %global srcname rpmautospec Name: python-rpmautospec -Version: 0.3.4 +Version: 0.3.5 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs diff --git a/sources b/sources index eec854e..1e27dd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.3.4.tar.gz) = fcca7b30e76ac9e8cef72e35a2707937d94fac3ce13d925f6f0f9ae64e6a48ce7660d4160606b540c40bdfdb1699e195ca442a070d40271198a724223c979c42 +SHA512 (rpmautospec-0.3.5.tar.gz) = 5a692f0b6916ff77b1d86d5518801aa64e48844e532af40c378e61415f5a407dc9d53adac58a584e6e9ad8b13f606b8ef42f852117b5ee2fb068819bbf138743 From 480f5d532a5255f8eb478469f8de4cc2e84d65d2 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 24 May 2023 14:03:48 -0400 Subject: [PATCH 59/83] Avoid pytest-cov, disable xdist in RHEL builds Coverage tests are unwanted in both RHEL and Fedora builds: https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters pytest-xdist is unwanted in RHEL, so adjust the default accordingly. Also, use the %%pytest macro to set appropriate variables. --- python-rpmautospec.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 24e4503..cdb67b3 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -1,5 +1,5 @@ # when bootstrapping Python, pytest-xdist is not yet available -%bcond_without xdist +%bcond xdist %{undefined rhel} %global srcname rpmautospec @@ -24,7 +24,6 @@ BuildRequires: python%{python3_pkgversion}-babel BuildRequires: python3-koji BuildRequires: python3-pygit2 BuildRequires: python%{python3_pkgversion}-pytest -BuildRequires: python%{python3_pkgversion}-pytest-cov %if %{with xdist} BuildRequires: python%{python3_pkgversion}-pytest-xdist %endif @@ -123,8 +122,7 @@ mkdir -p %{buildroot}%{rpmmacrodir} install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %check -PYTHONPATH="%{buildroot}%{python3_sitelib}" \ -%{__python3} -m pytest \ +%pytest \ %if %{with xdist} --numprocesses=auto %endif From 8d3dc0af1fbe013198a6c04e0b9339e943d5e1d9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 15 Jun 2023 00:05:31 +0200 Subject: [PATCH 60/83] Rebuilt for Python 3.12 From 22de4c9e28711161ae08d4577b1cfcdf7023b8e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 13:45:31 +0000 Subject: [PATCH 61/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 7f0832b7d36468849e4a3d8922dbcbb6fa575974 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 22 Aug 2023 16:07:06 -0400 Subject: [PATCH 62/83] Disable the macros subpackage in F40+ The macros were added to F40 (and hence ELN and RHEL 10) in redhat-rpm-config 264. --- python-rpmautospec.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index cdb67b3..fdcf03a 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -86,7 +86,8 @@ A Koji plugin for generating RPM releases and changelogs. %files -n koji-builder-plugin-rpmautospec %{_prefix}/lib/koji-builder-plugins/* -# Package the placeholder rpm-macros +%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10) +# Package the placeholder rpm-macros (moved to redhat-rpm-config in F40) %package -n rpmautospec-rpm-macros Summary: Rpmautospec RPM macros for local rpmbuild @@ -97,6 +98,7 @@ RPM macros with placeholders for building rpmautospec enabled packages localy %files -n rpmautospec-rpm-macros %{rpmmacrodir}/macros.rpmautospec +%endif #-------------------------------------------------------- @@ -117,9 +119,11 @@ install -m 0644 koji_plugins/rpmautospec_builder.py \ %py_byte_compile %{python3} %{buildroot}%{_prefix}/lib/koji-builder-plugins/ +%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10) # RPM macros mkdir -p %{buildroot}%{rpmmacrodir} install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ +%endif %check %pytest \ From 5f50ea22b6777c4720ecf698dc7d0a52f74a5f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 23 Feb 2023 14:50:36 +0100 Subject: [PATCH 63/83] Run pytest with -v [skip changelog] --- python-rpmautospec.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index fdcf03a..09dce97 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -126,7 +126,7 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif %check -%pytest \ +%pytest -v \ %if %{with xdist} --numprocesses=auto %endif From 2e6cdfb3201e895e6ccc4c9573833b9ed1894ea3 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 13 Nov 2023 20:07:57 +0100 Subject: [PATCH 64/83] Update to 0.3.6 Additionally, tidy up and modernize the spec file. Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 136 +++++++++++++++++++--------------------- sources | 2 +- 2 files changed, 64 insertions(+), 74 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 09dce97..c7db020 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -1,126 +1,103 @@ # when bootstrapping Python, pytest-xdist is not yet available %bcond xdist %{undefined rhel} -%global srcname rpmautospec - -Name: python-rpmautospec -Version: 0.3.5 -Release: %autorelease -Summary: Package and CLI tool to generate release fields and changelogs - -License: MIT -URL: https://pagure.io/fedora-infra/rpmautospec -Source0: https://releases.pagure.org/fedora-infra/rpmautospec/rpmautospec-%{version}.tar.gz - -BuildArch: noarch -BuildRequires: git -# the langpacks are needed for tests -BuildRequires: glibc-langpack-de -BuildRequires: glibc-langpack-en -BuildRequires: python3-devel >= 3.6.0 -BuildRequires: python3-setuptools -BuildRequires: koji -BuildRequires: python%{python3_pkgversion}-babel -BuildRequires: python3-koji -BuildRequires: python3-pygit2 -BuildRequires: python%{python3_pkgversion}-pytest -%if %{with xdist} -BuildRequires: python%{python3_pkgversion}-pytest-xdist +# Package the placeholder rpm-macros (moved to redhat-rpm-config in F40) +%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10) +%bcond rpmmacropkg 1 +%else +%bcond rpmmacropkg 0 %endif -BuildRequires: python%{python3_pkgversion}-pyyaml -Obsoletes: koji-hub-plugin-rpmautospec < 0.1.5-2 -Conflicts: koji-hub-plugin-rpmautospec < 0.1.5-2 +%global srcname rpmautospec +%global canonicalname %{py_dist_name %{srcname}} + +Name: python-%{canonicalname} +Version: 0.3.6 +Release: %autorelease +Summary: Package and CLI tool to generate release fields and changelogs +License: MIT +URL: https://github.com/fedora-infra/%{canonicalname} +Source0: https://github.com/fedora-infra/%{canonicalname}/releases/download/%{version}/%{canonicalname}-%{version}.tar.gz + +BuildArch: noarch +BuildRequires: git +# the langpacks are needed for tests +BuildRequires: glibc-langpack-de +BuildRequires: glibc-langpack-en +BuildRequires: koji +BuildRequires: python3-devel >= 3.9.0 +# The dependencies needed for testing don’t get auto-generated. +BuildRequires: python3dist(pytest) +BuildRequires: python3dist(pytest-cov) +%if %{with xdist} +BuildRequires: python3dist(pytest-xdist) +%endif +BuildRequires: python3dist(pyyaml) +BuildRequires: sed %global _description %{expand: A package and CLI tool to generate RPM release fields and changelogs.} %description %_description -# package the library - -%package -n python3-%{srcname} -Summary: %{summary} +%package -n python3-%{canonicalname} +Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} Requires: koji -Requires: python3-babel -Requires: python3-koji -Requires: python3-pygit2 Requires: rpm # for "rpm --specfile" Requires: rpm-build >= 4.9 -%description -n python3-%{srcname} %_description +%description -n python3-%{canonicalname} %_description -# Note that there is no %%files section for the unversioned python module -%files -n python3-%{srcname} -%license LICENSE -%doc README.rst -%{python3_sitelib}/%{srcname}-*.egg-info -%{python3_sitelib}/%{srcname}/ - -# package the cli tool - -%package -n %{srcname} +%package -n %{canonicalname} Summary: CLI tool for generating RPM releases and changelogs -Requires: python3-%{srcname} = %{version}-%{release} +Requires: python3-%{canonicalname} = %{version}-%{release} -%description -n %{srcname} +%description -n %{canonicalname} CLI tool for generating RPM releases and changelogs -%files -n %{srcname} -%{_bindir}/rpmautospec - -# package the Koji plugins - %package -n koji-builder-plugin-rpmautospec Summary: Koji plugin for generating RPM releases and changelogs -Requires: python3-%{srcname} = %{version}-%{release} -Requires: python3-koji +Requires: python3-%{canonicalname} = %{version}-%{release} Requires: koji-builder-plugins %description -n koji-builder-plugin-rpmautospec A Koji plugin for generating RPM releases and changelogs. -%files -n koji-builder-plugin-rpmautospec -%{_prefix}/lib/koji-builder-plugins/* - -%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10) -# Package the placeholder rpm-macros (moved to redhat-rpm-config in F40) - +%if %{with rpmmacropkg} %package -n rpmautospec-rpm-macros Summary: Rpmautospec RPM macros for local rpmbuild Requires: rpm %description -n rpmautospec-rpm-macros -RPM macros with placeholders for building rpmautospec enabled packages localy - -%files -n rpmautospec-rpm-macros -%{rpmmacrodir}/macros.rpmautospec +This package contains RPM macros with placeholders for building rpmautospec +enabled packages locally. %endif -#-------------------------------------------------------- +%generate_buildrequires +%pyproject_buildrequires %prep %autosetup -n %{srcname}-%{version} -# The python3-koji package doesn't declare itself properly, so we may not depend on it when -# installed as an RPM. -sed -i /koji/d requirements.txt %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files %{srcname} +# Work around poetry not listing license files as such in package metadata. +sed -i -e 's|^\(.*/LICENSE\)|%%license \1|g' %{pyproject_files} + mkdir -p %{buildroot}%{_prefix}/lib/koji-builder-plugins/ install -m 0644 koji_plugins/rpmautospec_builder.py \ %{buildroot}%{_prefix}/lib/koji-builder-plugins/ %py_byte_compile %{python3} %{buildroot}%{_prefix}/lib/koji-builder-plugins/ -%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10) -# RPM macros +%if %{with rpmmacropkg} mkdir -p %{buildroot}%{rpmmacrodir} install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %endif @@ -131,6 +108,19 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ --numprocesses=auto %endif +%files -n python3-%{canonicalname} -f %{pyproject_files} +%doc README.rst + +%files -n %{canonicalname} +%{_bindir}/rpmautospec + +%files -n koji-builder-plugin-rpmautospec +%{_prefix}/lib/koji-builder-plugins/* + +%if %{with rpmmacropkg} +%files -n rpmautospec-rpm-macros +%{rpmmacrodir}/macros.rpmautospec +%endif %changelog %autochangelog diff --git a/sources b/sources index 1e27dd9..aa15b08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.3.5.tar.gz) = 5a692f0b6916ff77b1d86d5518801aa64e48844e532af40c378e61415f5a407dc9d53adac58a584e6e9ad8b13f606b8ef42f852117b5ee2fb068819bbf138743 +SHA512 (rpmautospec-0.3.6.tar.gz) = 3e2ff487925c8de2cb00afcebb2aa8125164774486b41acedc2d43f8b9a5e1fac215cfda9dd881fc335db27992c74badb507a783ad86f8a2c6b80231cefc59ec From e2e8052efecb1a4897532f5133760326be9d64cb Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 14 Nov 2023 13:43:30 +0100 Subject: [PATCH 65/83] Update to 0.3.7 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index c7db020..db6a230 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -12,7 +12,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.3.6 +Version: 0.3.7 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs License: MIT diff --git a/sources b/sources index aa15b08..24c5915 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.3.6.tar.gz) = 3e2ff487925c8de2cb00afcebb2aa8125164774486b41acedc2d43f8b9a5e1fac215cfda9dd881fc335db27992c74badb507a783ad86f8a2c6b80231cefc59ec +SHA512 (rpmautospec-0.3.7.tar.gz) = f5fb4ecf4c0647eefd5b5ded752ad304402bb8de6bf67a2dcf4825c4819a990df78e84e0e956f07e48c12d760c2b4a1187d338c2ec632ec0496482d1e8b5e47f From 264dae5a4c99c5ab99be360e1f136d3eec288db3 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 14 Nov 2023 14:11:32 +0100 Subject: [PATCH 66/83] Fix building on Fedora 37 and EPEL 9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These OS releases come with a Poetry version older than 1.2 and don’t cope with group sections in pyproject.toml. [skip changelog] Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 14 +++++++++++++- rpmautospec-0.3.7-old-poetry.patch | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 rpmautospec-0.3.7-old-poetry.patch diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index db6a230..e3e199b 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -8,6 +8,13 @@ %bcond rpmmacropkg 0 %endif +# Appease old Poetry versions (<1.2.0a2) +%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 38 || 0%{?rhel} >= 10 +%bcond oldpoetry 0 +%else +%bcond oldpoetry 1 +%endif + %global srcname rpmautospec %global canonicalname %{py_dist_name %{srcname}} @@ -18,6 +25,7 @@ Summary: Package and CLI tool to generate release fields and changelogs License: MIT URL: https://github.com/fedora-infra/%{canonicalname} Source0: https://github.com/fedora-infra/%{canonicalname}/releases/download/%{version}/%{canonicalname}-%{version}.tar.gz +Patch100: rpmautospec-0.3.7-old-poetry.patch BuildArch: noarch BuildRequires: git @@ -80,7 +88,11 @@ enabled packages locally. %pyproject_buildrequires %prep -%autosetup -n %{srcname}-%{version} +%autosetup -n %{srcname}-%{version} -N +%autopatch -M 99 +%if %{with oldpoetry} +%autopatch 100 +%endif %build %pyproject_wheel diff --git a/rpmautospec-0.3.7-old-poetry.patch b/rpmautospec-0.3.7-old-poetry.patch new file mode 100644 index 0000000..0fb7034 --- /dev/null +++ b/rpmautospec-0.3.7-old-poetry.patch @@ -0,0 +1,12 @@ +diff -up rpmautospec-0.3.7/pyproject.toml.old-poetry rpmautospec-0.3.7/pyproject.toml +--- rpmautospec-0.3.7/pyproject.toml.old-poetry 2023-11-14 13:33:59.369684500 +0100 ++++ rpmautospec-0.3.7/pyproject.toml 2023-11-14 13:57:31.085972996 +0100 +@@ -47,7 +47,7 @@ babel = "^2.9" + koji = "^1.33.0" + pygit2 = "^1.2.1" + +-[tool.poetry.group.dev.dependencies] ++[tool.poetry.dev-dependencies] + pyyaml = "^5.3.1 || ^6" + pytest = "^6.2.2 || ^7" + pytest-cov = "^4.0.0" From b40bc63be8f5d9e997fcbb3edb5e256a88f8a7be Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 14 Nov 2023 17:31:55 +0100 Subject: [PATCH 67/83] Update to 0.3.8 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index e3e199b..3a342b5 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -19,7 +19,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.3.7 +Version: 0.3.8 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs License: MIT diff --git a/sources b/sources index 24c5915..3f992e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.3.7.tar.gz) = f5fb4ecf4c0647eefd5b5ded752ad304402bb8de6bf67a2dcf4825c4819a990df78e84e0e956f07e48c12d760c2b4a1187d338c2ec632ec0496482d1e8b5e47f +SHA512 (rpmautospec-0.3.8.tar.gz) = bed1b01e7884f85929e4b5af2e43e0189ef75d3e3a4e0fb350d68e01b25b246328494ebaf9a59eb94df18026603c9a14791816090fa25c965339d74af340ee0d From e750469eea6d36777de1bbdb8d0c9a354a551030 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 30 Nov 2023 17:34:31 +0100 Subject: [PATCH 68/83] Update to 0.4.0 This removes the Koji plugin which will be built from its own source package. Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 25 +------------------------ sources | 2 +- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 3a342b5..d6fc43c 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -19,7 +19,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.3.8 +Version: 0.4.0 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -32,7 +32,6 @@ BuildRequires: git # the langpacks are needed for tests BuildRequires: glibc-langpack-de BuildRequires: glibc-langpack-en -BuildRequires: koji BuildRequires: python3-devel >= 3.9.0 # The dependencies needed for testing don’t get auto-generated. BuildRequires: python3dist(pytest) @@ -52,11 +51,6 @@ A package and CLI tool to generate RPM release fields and changelogs.} Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} -Requires: koji -Requires: rpm -# for "rpm --specfile" -Requires: rpm-build >= 4.9 - %description -n python3-%{canonicalname} %_description %package -n %{canonicalname} @@ -66,14 +60,6 @@ Requires: python3-%{canonicalname} = %{version}-%{release} %description -n %{canonicalname} CLI tool for generating RPM releases and changelogs -%package -n koji-builder-plugin-rpmautospec -Summary: Koji plugin for generating RPM releases and changelogs -Requires: python3-%{canonicalname} = %{version}-%{release} -Requires: koji-builder-plugins - -%description -n koji-builder-plugin-rpmautospec -A Koji plugin for generating RPM releases and changelogs. - %if %{with rpmmacropkg} %package -n rpmautospec-rpm-macros Summary: Rpmautospec RPM macros for local rpmbuild @@ -103,12 +89,6 @@ enabled packages locally. # Work around poetry not listing license files as such in package metadata. sed -i -e 's|^\(.*/LICENSE\)|%%license \1|g' %{pyproject_files} -mkdir -p %{buildroot}%{_prefix}/lib/koji-builder-plugins/ -install -m 0644 koji_plugins/rpmautospec_builder.py \ - %{buildroot}%{_prefix}/lib/koji-builder-plugins/ - -%py_byte_compile %{python3} %{buildroot}%{_prefix}/lib/koji-builder-plugins/ - %if %{with rpmmacropkg} mkdir -p %{buildroot}%{rpmmacrodir} install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ @@ -126,9 +106,6 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %files -n %{canonicalname} %{_bindir}/rpmautospec -%files -n koji-builder-plugin-rpmautospec -%{_prefix}/lib/koji-builder-plugins/* - %if %{with rpmmacropkg} %files -n rpmautospec-rpm-macros %{rpmmacrodir}/macros.rpmautospec diff --git a/sources b/sources index 3f992e8..321f59b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.3.8.tar.gz) = bed1b01e7884f85929e4b5af2e43e0189ef75d3e3a4e0fb350d68e01b25b246328494ebaf9a59eb94df18026603c9a14791816090fa25c965339d74af340ee0d +SHA512 (rpmautospec-0.4.0.tar.gz) = fa3d99d2b0115cba88d9ba159df73ae9decea738fe037b0127237f86ad2a4441e7f82a3811d71af1aff4395553ce1ac06b33858e2d326d6dbe2e534eb543d517 From 9e5158a802b1e5a6768c355e3867dd1cc27d71dd Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sat, 2 Dec 2023 22:59:28 -0500 Subject: [PATCH 69/83] Drop unwanted python-pytest-cov dependency Coverage checkers should not be run when building Fedora or RHEL packages: https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters --- python-rpmautospec.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index d6fc43c..b2ed089 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -35,7 +35,6 @@ BuildRequires: glibc-langpack-en BuildRequires: python3-devel >= 3.9.0 # The dependencies needed for testing don’t get auto-generated. BuildRequires: python3dist(pytest) -BuildRequires: python3dist(pytest-cov) %if %{with xdist} BuildRequires: python3dist(pytest-xdist) %endif @@ -80,6 +79,9 @@ enabled packages locally. %autopatch 100 %endif +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters +sed -i -e '/pytest-cov/d' pyproject.toml + %build %pyproject_wheel From 1d86aabe532179cac158465c99b3f144bca3f801 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 15 Dec 2023 23:10:48 +0100 Subject: [PATCH 70/83] Update to 0.4.1 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index b2ed089..1565846 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -19,7 +19,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.4.0 +Version: 0.4.1 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs License: MIT diff --git a/sources b/sources index 321f59b..704e88f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.4.0.tar.gz) = fa3d99d2b0115cba88d9ba159df73ae9decea738fe037b0127237f86ad2a4441e7f82a3811d71af1aff4395553ce1ac06b33858e2d326d6dbe2e534eb543d517 +SHA512 (rpmautospec-0.4.1.tar.gz) = 5400c726abbf5de28df7f475db6abc83262e7aa70dc6fffebbd85e58577a1340012408611858aac259b7e3f86e96e2ff383ba3d680f8d10ff524afa42d11f1ed From f4db85d49a7aa2f1b84aa11411e9157d08d0938d Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 8 Jan 2024 15:34:01 +0100 Subject: [PATCH 71/83] Update patch for old poetry versions Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- rpmautospec-0.3.7-old-poetry.patch | 12 ------------ rpmautospec-0.4.1-old-poetry.patch | 12 ++++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 rpmautospec-0.3.7-old-poetry.patch create mode 100644 rpmautospec-0.4.1-old-poetry.patch diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 1565846..4decfc4 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -25,7 +25,7 @@ Summary: Package and CLI tool to generate release fields and changelogs License: MIT URL: https://github.com/fedora-infra/%{canonicalname} Source0: https://github.com/fedora-infra/%{canonicalname}/releases/download/%{version}/%{canonicalname}-%{version}.tar.gz -Patch100: rpmautospec-0.3.7-old-poetry.patch +Patch100: rpmautospec-0.4.1-old-poetry.patch BuildArch: noarch BuildRequires: git diff --git a/rpmautospec-0.3.7-old-poetry.patch b/rpmautospec-0.3.7-old-poetry.patch deleted file mode 100644 index 0fb7034..0000000 --- a/rpmautospec-0.3.7-old-poetry.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up rpmautospec-0.3.7/pyproject.toml.old-poetry rpmautospec-0.3.7/pyproject.toml ---- rpmautospec-0.3.7/pyproject.toml.old-poetry 2023-11-14 13:33:59.369684500 +0100 -+++ rpmautospec-0.3.7/pyproject.toml 2023-11-14 13:57:31.085972996 +0100 -@@ -47,7 +47,7 @@ babel = "^2.9" - koji = "^1.33.0" - pygit2 = "^1.2.1" - --[tool.poetry.group.dev.dependencies] -+[tool.poetry.dev-dependencies] - pyyaml = "^5.3.1 || ^6" - pytest = "^6.2.2 || ^7" - pytest-cov = "^4.0.0" diff --git a/rpmautospec-0.4.1-old-poetry.patch b/rpmautospec-0.4.1-old-poetry.patch new file mode 100644 index 0000000..68b2078 --- /dev/null +++ b/rpmautospec-0.4.1-old-poetry.patch @@ -0,0 +1,12 @@ +diff -up rpmautospec-0.4.1/pyproject.toml.old-poetry rpmautospec-0.4.1/pyproject.toml +--- rpmautospec-0.4.1/pyproject.toml.old-poetry 2023-12-15 23:05:03.757565500 +0100 ++++ rpmautospec-0.4.1/pyproject.toml 2024-01-08 15:32:14.863630739 +0100 +@@ -47,7 +47,7 @@ babel = "^2.9" + pygit2 = "^1.2.1" + rpm = "*" + +-[tool.poetry.group.dev.dependencies] ++[tool.poetry.dev-dependencies] + pyyaml = "^5.3.1 || ^6" + pytest = "^6.2.2 || ^7" + pytest-cov = "^4.0.0" From 9ee17e7b6863dc697f409873e92ff7c7ea6da2e3 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 11 Jan 2024 15:18:41 +0100 Subject: [PATCH 72/83] Update to 0.4.2 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 4 ++-- sources | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 4decfc4..253b7c9 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -19,7 +19,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.4.1 +Version: 0.4.2 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs License: MIT @@ -80,7 +80,7 @@ enabled packages locally. %endif # https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters -sed -i -e '/pytest-cov/d' pyproject.toml +sed -i -e '/pytest-cov/d; /addopts.*--cov/d' pyproject.toml %build %pyproject_wheel diff --git a/sources b/sources index 704e88f..229a80c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.4.1.tar.gz) = 5400c726abbf5de28df7f475db6abc83262e7aa70dc6fffebbd85e58577a1340012408611858aac259b7e3f86e96e2ff383ba3d680f8d10ff524afa42d11f1ed +SHA512 (rpmautospec-0.4.2.tar.gz) = 1b99b360f5a598f43793682ca18faa0b3e07c8bb5dba6257dbab723c278619a717043231b4c363aa226d5ef5878c196675138cf62e0151282837a33f52419ca3 From ce3b60166ad54dbebd80ad780da65b8003dc65c6 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 15 Jan 2024 11:56:56 +0100 Subject: [PATCH 73/83] Update to 0.5.0 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 253b7c9..7a164dc 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -19,7 +19,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.4.2 +Version: 0.5.0 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs License: MIT diff --git a/sources b/sources index 229a80c..95722d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.4.2.tar.gz) = 1b99b360f5a598f43793682ca18faa0b3e07c8bb5dba6257dbab723c278619a717043231b4c363aa226d5ef5878c196675138cf62e0151282837a33f52419ca3 +SHA512 (rpmautospec-0.5.0.tar.gz) = feebfdb9602ac1fc372c4964b08126562a265f73064c8af1dc114ac7c668f8233e9c1695fc6c48eddfad9e3e9f1508b02b76bf8f233fbbaf96ec50d7ec0ebeb6 From 3600869117d7959f43fb11ed0f195bd8bb35f845 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 16 Jan 2024 16:48:36 +0100 Subject: [PATCH 74/83] Update to 0.5.1 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 7a164dc..4ef8e85 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -19,7 +19,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.5.0 +Version: 0.5.1 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs License: MIT diff --git a/sources b/sources index 95722d4..92b1753 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.5.0.tar.gz) = feebfdb9602ac1fc372c4964b08126562a265f73064c8af1dc114ac7c668f8233e9c1695fc6c48eddfad9e3e9f1508b02b76bf8f233fbbaf96ec50d7ec0ebeb6 +SHA512 (rpmautospec-0.5.1.tar.gz) = 07b360d30d4d6df9c5e7ad9b35731bef60412d763c1b5fe42ea4641147e3b49631b4162ddb9f62bc4d41f706168e37af47629ab48c2b77dd2acffc631bddc28f From 818b856d6c6ec7bc3efa0f7c899e904858985200 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 06:42:05 +0000 Subject: [PATCH 75/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 822df001583f05786dee31654bcd9b94931f2ec4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 10:19:20 +0000 Subject: [PATCH 76/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a5ee52b329824634ae9c1cbf0af0ce6406bf54b5 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sat, 27 Jan 2024 10:57:32 +0100 Subject: [PATCH 77/83] Update to 0.6.0 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 4ef8e85..7a37345 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -19,7 +19,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.5.1 +Version: 0.6.0 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs License: MIT diff --git a/sources b/sources index 92b1753..c68dce9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.5.1.tar.gz) = 07b360d30d4d6df9c5e7ad9b35731bef60412d763c1b5fe42ea4641147e3b49631b4162ddb9f62bc4d41f706168e37af47629ab48c2b77dd2acffc631bddc28f +SHA512 (rpmautospec-0.6.0.tar.gz) = 19f07247060f23b7277ed214e64969558536ce94e8f7bf91ca4ff6fb4f1d6589d9c8056adec9ee72e87cd923b94e6c02ee3bc7605e74df912a8193c51a27a94e From 9cefebf25e84892b390ab60a8dabd42c981eff63 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sat, 27 Jan 2024 11:12:41 +0100 Subject: [PATCH 78/83] Update old-poetry patch [skip changelog] Signed-off-by: Nils Philippsen --- python-rpmautospec-0.6.0-old-poetry.patch | 12 ++++++++++++ python-rpmautospec.spec | 2 +- rpmautospec-0.4.1-old-poetry.patch | 12 ------------ 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 python-rpmautospec-0.6.0-old-poetry.patch delete mode 100644 rpmautospec-0.4.1-old-poetry.patch diff --git a/python-rpmautospec-0.6.0-old-poetry.patch b/python-rpmautospec-0.6.0-old-poetry.patch new file mode 100644 index 0000000..929d2b5 --- /dev/null +++ b/python-rpmautospec-0.6.0-old-poetry.patch @@ -0,0 +1,12 @@ +diff -up rpmautospec-0.6.0/pyproject.toml.old-poetry rpmautospec-0.6.0/pyproject.toml +--- rpmautospec-0.6.0/pyproject.toml.old-poetry 2024-01-27 10:16:00.742831700 +0100 ++++ rpmautospec-0.6.0/pyproject.toml 2024-01-27 11:11:14.965480544 +0100 +@@ -47,7 +47,7 @@ babel = "^2.9" + pygit2 = "^1.4.0" + rpm = "*" + +-[tool.poetry.group.dev.dependencies] ++[tool.poetry.dev-dependencies] + pyyaml = "^5.3.1 || ^6" + pytest = "^6.2.2 || ^7" + pytest-cov = "^4.0.0" diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 7a37345..0335a6a 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -25,7 +25,7 @@ Summary: Package and CLI tool to generate release fields and changelogs License: MIT URL: https://github.com/fedora-infra/%{canonicalname} Source0: https://github.com/fedora-infra/%{canonicalname}/releases/download/%{version}/%{canonicalname}-%{version}.tar.gz -Patch100: rpmautospec-0.4.1-old-poetry.patch +Patch100: python-rpmautospec-0.6.0-old-poetry.patch BuildArch: noarch BuildRequires: git diff --git a/rpmautospec-0.4.1-old-poetry.patch b/rpmautospec-0.4.1-old-poetry.patch deleted file mode 100644 index 68b2078..0000000 --- a/rpmautospec-0.4.1-old-poetry.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up rpmautospec-0.4.1/pyproject.toml.old-poetry rpmautospec-0.4.1/pyproject.toml ---- rpmautospec-0.4.1/pyproject.toml.old-poetry 2023-12-15 23:05:03.757565500 +0100 -+++ rpmautospec-0.4.1/pyproject.toml 2024-01-08 15:32:14.863630739 +0100 -@@ -47,7 +47,7 @@ babel = "^2.9" - pygit2 = "^1.2.1" - rpm = "*" - --[tool.poetry.group.dev.dependencies] -+[tool.poetry.dev-dependencies] - pyyaml = "^5.3.1 || ^6" - pytest = "^6.2.2 || ^7" - pytest-cov = "^4.0.0" From 945ef757cbda0ded2afc1b11b4be3dc522aee5e3 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 9 Feb 2024 10:22:34 +0100 Subject: [PATCH 79/83] Update to 0.6.1 Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 0335a6a..c0e8f01 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -19,7 +19,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.6.0 +Version: 0.6.1 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs License: MIT diff --git a/sources b/sources index c68dce9..95abe0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.6.0.tar.gz) = 19f07247060f23b7277ed214e64969558536ce94e8f7bf91ca4ff6fb4f1d6589d9c8056adec9ee72e87cd923b94e6c02ee3bc7605e74df912a8193c51a27a94e +SHA512 (rpmautospec-0.6.1.tar.gz) = c16cb4cebde455cd4ef997dd7ae1c8a08dcb62fa8de3c84644e4994506f65f991dfab4c11350594971e68fbdd8ace9bb7ef7ceddf562c4756680a95cf1a89439 From 9cf1aaf7b06ce743bd11f7c685141301ad4da648 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 9 Feb 2024 10:43:22 +0100 Subject: [PATCH 80/83] Apply workaround for old poetry with sed [skip changelog] Signed-off-by: Nils Philippsen --- python-rpmautospec-0.6.0-old-poetry.patch | 12 ------------ python-rpmautospec.spec | 8 ++++---- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 python-rpmautospec-0.6.0-old-poetry.patch diff --git a/python-rpmautospec-0.6.0-old-poetry.patch b/python-rpmautospec-0.6.0-old-poetry.patch deleted file mode 100644 index 929d2b5..0000000 --- a/python-rpmautospec-0.6.0-old-poetry.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up rpmautospec-0.6.0/pyproject.toml.old-poetry rpmautospec-0.6.0/pyproject.toml ---- rpmautospec-0.6.0/pyproject.toml.old-poetry 2024-01-27 10:16:00.742831700 +0100 -+++ rpmautospec-0.6.0/pyproject.toml 2024-01-27 11:11:14.965480544 +0100 -@@ -47,7 +47,7 @@ babel = "^2.9" - pygit2 = "^1.4.0" - rpm = "*" - --[tool.poetry.group.dev.dependencies] -+[tool.poetry.dev-dependencies] - pyyaml = "^5.3.1 || ^6" - pytest = "^6.2.2 || ^7" - pytest-cov = "^4.0.0" diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index c0e8f01..c2578ce 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -25,7 +25,6 @@ Summary: Package and CLI tool to generate release fields and changelogs License: MIT URL: https://github.com/fedora-infra/%{canonicalname} Source0: https://github.com/fedora-infra/%{canonicalname}/releases/download/%{version}/%{canonicalname}-%{version}.tar.gz -Patch100: python-rpmautospec-0.6.0-old-poetry.patch BuildArch: noarch BuildRequires: git @@ -73,10 +72,11 @@ enabled packages locally. %pyproject_buildrequires %prep -%autosetup -n %{srcname}-%{version} -N -%autopatch -M 99 +%autosetup -n %{srcname}-%{version} %if %{with oldpoetry} -%autopatch 100 +sed -i \ + -e 's/\[tool\.poetry\.group\.dev\.dependencies\]/[tool.poetry.dev-dependencies]/g' \ + pyproject.toml %endif # https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters From d997a3d16a1cd913015bec2916407c3e17d0ddfe Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 9 Feb 2024 11:37:50 +0100 Subject: [PATCH 81/83] =?UTF-8?q?Don=E2=80=99t=20use=20%py=5Fdist=5Fname?= =?UTF-8?q?=20macro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the spec file robust against it being undefined, in case the respective macro package is missing when the SRPM is built. Also, explain the xdist conditional better. [skip changelog] Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index c2578ce..4a5a606 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -1,4 +1,4 @@ -# when bootstrapping Python, pytest-xdist is not yet available +# The pytest-xdist package is not available when bootstrapping or for EL builds %bcond xdist %{undefined rhel} # Package the placeholder rpm-macros (moved to redhat-rpm-config in F40) @@ -16,15 +16,14 @@ %endif %global srcname rpmautospec -%global canonicalname %{py_dist_name %{srcname}} -Name: python-%{canonicalname} +Name: python-%{srcname} Version: 0.6.1 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs License: MIT -URL: https://github.com/fedora-infra/%{canonicalname} -Source0: https://github.com/fedora-infra/%{canonicalname}/releases/download/%{version}/%{canonicalname}-%{version}.tar.gz +URL: https://github.com/fedora-infra/%{srcname} +Source0: https://github.com/fedora-infra/%{srcname}/releases/download/%{version}/%{srcname}-%{version}.tar.gz BuildArch: noarch BuildRequires: git @@ -45,17 +44,17 @@ A package and CLI tool to generate RPM release fields and changelogs.} %description %_description -%package -n python3-%{canonicalname} +%package -n python3-%{srcname} Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} -%description -n python3-%{canonicalname} %_description +%description -n python3-%{srcname} %_description -%package -n %{canonicalname} +%package -n %{srcname} Summary: CLI tool for generating RPM releases and changelogs -Requires: python3-%{canonicalname} = %{version}-%{release} +Requires: python3-%{srcname} = %{version}-%{release} -%description -n %{canonicalname} +%description -n %{srcname} CLI tool for generating RPM releases and changelogs %if %{with rpmmacropkg} @@ -102,10 +101,10 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ --numprocesses=auto %endif -%files -n python3-%{canonicalname} -f %{pyproject_files} +%files -n python3-%{srcname} -f %{pyproject_files} %doc README.rst -%files -n %{canonicalname} +%files -n %{srcname} %{_bindir}/rpmautospec %if %{with rpmmacropkg} From f4f18b88d7cd60acdbaf7fe793975ca77d0de97f Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 24 Jun 2024 09:19:38 -0700 Subject: [PATCH 82/83] Bump release for June 2024 mass rebuild From 2e0a1b7cfcbb3247b571372c24d572a3caf3f63a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 19 Feb 2024 10:43:03 +0100 Subject: [PATCH 83/83] Update to 0.6.5 - Install man page Additionally, enable building without poetry and add fill-in for %bcond macro for platforms where poetry is missing. Signed-off-by: Nils Philippsen --- python-rpmautospec.spec | 65 ++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index 4a5a606..dd64014 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -1,3 +1,11 @@ +# Polyfill %%bcond() macro for platforms without it +%if 0%{!?bcond:1} +%define bcond() %[ (%2)\ + ? "%{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}"\ + : "%{expand:%%{?_with_%{1}:%%global with_%{1} 1}}"\ +] +%endif + # The pytest-xdist package is not available when bootstrapping or for EL builds %bcond xdist %{undefined rhel} @@ -8,24 +16,40 @@ %bcond rpmmacropkg 0 %endif +%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} || 0%{?epel} >= 9 +%bcond poetry 1 # Appease old Poetry versions (<1.2.0a2) %if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 38 || 0%{?rhel} >= 10 -%bcond oldpoetry 0 +%bcond old_poetry 0 %else -%bcond oldpoetry 1 +%bcond old_poetry 1 +%endif +%else +%bcond poetry 0 +%endif + +%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} || 0%{?epel} >= 9 || 0%{?rhel} >= 10 +%bcond manpage_manual_title 1 +%else +%bcond manpage_manual_title 0 %endif %global srcname rpmautospec Name: python-%{srcname} -Version: 0.6.1 +Version: 0.6.5 Release: %autorelease Summary: Package and CLI tool to generate release fields and changelogs License: MIT URL: https://github.com/fedora-infra/%{srcname} Source0: https://github.com/fedora-infra/%{srcname}/releases/download/%{version}/%{srcname}-%{version}.tar.gz +%if 0%{!?pyproject_files:1} +%global pyproject_files %{_builddir}/%{name}-%{version}-%{release}.%{_arch}-pyproject-files +%endif + BuildArch: noarch +BuildRequires: argparse-manpage BuildRequires: git # the langpacks are needed for tests BuildRequires: glibc-langpack-de @@ -39,6 +63,15 @@ BuildRequires: python3dist(pytest-xdist) BuildRequires: python3dist(pyyaml) BuildRequires: sed +%if %{without poetry} +BuildRequires: python3dist(babel) +BuildRequires: python3dist(pygit2) +BuildRequires: python3dist(rpm) +BuildRequires: python3dist(rpmautospec-core) +BuildRequires: python3dist(setuptools) +%{?python_provide:%python_provide python3-%{srcname}} +%endif + %global _description %{expand: A package and CLI tool to generate RPM release fields and changelogs.} @@ -68,11 +101,13 @@ enabled packages locally. %endif %generate_buildrequires +%if %{with poetry} %pyproject_buildrequires +%endif %prep %autosetup -n %{srcname}-%{version} -%if %{with oldpoetry} +%if %{with old_poetry} sed -i \ -e 's/\[tool\.poetry\.group\.dev\.dependencies\]/[tool.poetry.dev-dependencies]/g' \ pyproject.toml @@ -82,13 +117,34 @@ sed -i \ sed -i -e '/pytest-cov/d; /addopts.*--cov/d' pyproject.toml %build +%if %{with poetry} %pyproject_wheel +%else +%py3_build +%endif %install +%if %{with poetry} %pyproject_install %pyproject_save_files %{srcname} # Work around poetry not listing license files as such in package metadata. sed -i -e 's|^\(.*/LICENSE\)|%%license \1|g' %{pyproject_files} +%else +%py3_install +cat << EOF > %{pyproject_files} +%{python3_sitelib}/%{srcname}/ +%{python3_sitelib}/*.egg-info/ +EOF +%endif + +install -d %{buildroot}%{_mandir}/man1 +PYTHONPATH=%{buildroot}%{python3_sitelib} argparse-manpage \ +%if %{with manpage_manual_title} + --manual-title "User Commands" \ +%endif + --project-name rpmautospec \ + --module rpmautospec.cli \ + --function get_arg_parser > %{buildroot}%{_mandir}/man1/rpmautospec.1 %if %{with rpmmacropkg} mkdir -p %{buildroot}%{rpmmacrodir} @@ -106,6 +162,7 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %files -n %{srcname} %{_bindir}/rpmautospec +%{_mandir}/man1/rpmautospec.1* %if %{with rpmmacropkg} %files -n rpmautospec-rpm-macros diff --git a/sources b/sources index 95abe0b..afb2ef8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec-0.6.1.tar.gz) = c16cb4cebde455cd4ef997dd7ae1c8a08dcb62fa8de3c84644e4994506f65f991dfab4c11350594971e68fbdd8ace9bb7ef7ceddf562c4756680a95cf1a89439 +SHA512 (rpmautospec-0.6.5.tar.gz) = 4740a471d25896314cbb37ab7a34d24fa7d3b6512ea4d5d7444528e0669bca79cb23a180b8a591378a40e832df4a6673ac20930f38672d268d9c70fb49748771