From b8a3210b4e3a7ca7b073da2306fc17112b180fce Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 25 Apr 2022 14:12:32 +0200 Subject: [PATCH] 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