From 9a30a91e7fdc42099d6675938ca089feef18859b Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 27 May 2021 17:25:34 +0200 Subject: [PATCH] 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