From 8781e4b051dd37137761e82eee7423dfcf063664 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Sat, 10 Feb 2024 01:36:16 +0300 Subject: [PATCH] import python-rpmautospec-0.6.1-3.el9 --- .gitignore | 2 +- .python-rpmautospec.metadata | 2 +- .../python-rpmautospec-0.6.0-old-poetry.patch | 12 ------ SPECS/python-rpmautospec.spec | 40 ++++++++++--------- 4 files changed, 23 insertions(+), 33 deletions(-) delete mode 100644 SOURCES/python-rpmautospec-0.6.0-old-poetry.patch diff --git a/.gitignore b/.gitignore index 3d5ff91..4be86e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rpmautospec-0.6.0.tar.gz +SOURCES/rpmautospec-0.6.1.tar.gz diff --git a/.python-rpmautospec.metadata b/.python-rpmautospec.metadata index 1aa661b..38ba0d6 100644 --- a/.python-rpmautospec.metadata +++ b/.python-rpmautospec.metadata @@ -1 +1 @@ -31dda6c51d069c55b3700050941636c8d6c9784d SOURCES/rpmautospec-0.6.0.tar.gz +13dada18ae4546ced2bbcb20e22b5851bf71bfb9 SOURCES/rpmautospec-0.6.1.tar.gz diff --git a/SOURCES/python-rpmautospec-0.6.0-old-poetry.patch b/SOURCES/python-rpmautospec-0.6.0-old-poetry.patch deleted file mode 100644 index 929d2b5..0000000 --- a/SOURCES/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/SPECS/python-rpmautospec.spec b/SPECS/python-rpmautospec.spec index 13d11c5..2b9b411 100644 --- a/SPECS/python-rpmautospec.spec +++ b/SPECS/python-rpmautospec.spec @@ -1,14 +1,14 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.5.1) +## (rpmautospec version 0.6.0) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; + release_number = 3; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec -# 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) @@ -26,16 +26,14 @@ %endif %global srcname rpmautospec -%global canonicalname %{py_dist_name %{srcname}} -Name: python-%{canonicalname} -Version: 0.6.0 +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 -Patch100: python-rpmautospec-0.6.0-old-poetry.patch +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 @@ -56,17 +54,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} @@ -83,10 +81,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 @@ -112,10 +111,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} @@ -125,6 +124,9 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/ %changelog ## START: Generated by rpmautospec +* Fri Feb 09 2024 Nils Philippsen - 0.6.1-1 +- Update to 0.6.1 + * Sat Jan 27 2024 Nils Philippsen - 0.6.0-1 - Update to 0.6.0