From 0d4bf76be344afe4332dc60375e60ea9d609a51d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 24 Jul 2023 11:00:10 -0400 Subject: [PATCH] bump to v4.6.0 --- .gitignore | 1 + python-podman.spec | 58 ++++++++++++++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 27d6807..c5e8b3b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /v4.4.1.tar.gz /v4.5.0.tar.gz /v4.5.1.tar.gz +/v4.6.0.tar.gz diff --git a/python-podman.spec b/python-podman.spec index 6e1a575..8d53a52 100644 --- a/python-podman.spec +++ b/python-podman.spec @@ -1,20 +1,33 @@ +# RHEL 8 envs has slightly different python deps +# and also doesn't support dynamic (build)requires. +%if %{defined rhel} && 0%{?rhel} == 8 +%define rhel8_py 1 +%endif + %global pypi_name podman %global desc %{pypi_name} is a library of bindings to use the RESTful API for Podman. %global pypi_dist 4 -%global built_tag v4.5.1 -%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) Name: python-%{pypi_name} +%if %{defined copr_username} +Epoch: 102 +%else Epoch: 3 -Version: %{gen_version} +%endif +# DO NOT TOUCH the Version string! +# The TRUE source of this specfile is: +# https://github.com/containers/podman/blob/main/rpm/python-podman.spec +# If that's what you're reading, Version must be 0, and will be updated by Packit for +# copr and koji builds. +# If you're reading this on dist-git, the version is automatically filled in by Packit. +Version: 4.6.0 License: Apache-2.0 Release: %autorelease Summary: RESTful API for Podman URL: https://github.com/containers/%{pypi_name}-py # Tarball fetched from upstream -Source0: %{url}/archive/%{built_tag}.tar.gz +Source0: %{url}/archive/v%{version}.tar.gz BuildArch: noarch %description @@ -23,8 +36,16 @@ BuildArch: noarch %package -n python%{python3_pkgversion}-%{pypi_name} BuildRequires: git-core BuildRequires: python%{python3_pkgversion}-devel +%if %{defined rhel8_py} +BuildRequires: python%{python3_pkgversion}-rpm-macros +BuildRequires: python%{python3_pkgversion}-pytoml +BuildRequires: python%{python3_pkgversion}-requests +Requires: python%{python3_pkgversion}-pytoml +Requires: python%{python3_pkgversion}-requests +%else BuildRequires: pyproject-rpm-macros -Provides: %{pypi_name}-py = %{version}-%{release} +%endif +Provides: %{pypi_name}-py = %{epoch}:%{version}-%{release} Provides: python%{python3_pkgversion}dist(%{pypi_name}) = %{pypi_dist} Provides: python%{python3_version}dist(%{pypi_name}) = %{pypi_dist} Obsoletes: python%{python3_pkgversion}-%{pypi_name}-api <= 0.0.0-1 @@ -36,23 +57,46 @@ Summary: %{summary} %desc %prep -%autosetup -Sgit -n %{pypi_name}-py-%{built_tag_strip} +%autosetup -Sgit -n %{pypi_name}-py-%{version} +%if !%{defined rhel8_py} %generate_buildrequires %pyproject_buildrequires %{?with_tests:-t} +%endif %build export PBR_VERSION="0.0.0" +%if %{defined rhel8_py} +%py3_build +%else %pyproject_wheel +%endif %install export PBR_VERSION="0.0.0" +%if %{defined rhel8_py} +%py3_install +%else %pyproject_install %pyproject_save_files %{pypi_name} +%endif +%if %{defined rhel8_py} +%files -n python%{python3_pkgversion}-%{pypi_name} +%dir %{python3_sitelib}/%{pypi_name}-*-py%{python3_version}.egg-info +%{python3_sitelib}/%{pypi_name}-*-py%{python3_version}.egg-info/* +%dir %{python3_sitelib}/%{pypi_name} +%{python3_sitelib}/%{pypi_name}/* +%else %files -n python%{python3_pkgversion}-%{pypi_name} -f %{pyproject_files} +%endif %license LICENSE %doc README.md %changelog +%if %{defined autochangelog} %autochangelog +%else +* Mon May 01 2023 RH Container Bot +- Placeholder changelog for envs that are not autochangelog-ready +%endif diff --git a/sources b/sources index e3468f5..c4b3d4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v4.5.1.tar.gz) = 09aa76fa3971c5e707ad6f99d5ae7ba11c9ac54877cf681f6acf471c80af476d9356cfae37a85ec602191193a4230af16a9f9e9d022457e87ffd2a7800b51112 +SHA512 (v4.6.0.tar.gz) = 4d60d3643e679d68f560988c2b31272703059dc000e6361b44d896df480a72f36df595f0122ee39f44874b76a7286bbf05ea8c045e5afa58bd0c7b0a5a42f2de