diff --git a/.gitignore b/.gitignore index 57428f8..92a7e26 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ /oslo.concurrency-3.29.1.tar.gz /oslo.concurrency-3.30.0.tar.gz /oslo.concurrency-4.0.2.tar.gz +/oslo.concurrency-4.3.0.tar.gz +/oslo.concurrency-4.3.0.tar.gz.asc +/0x2426b928085a020d8a90d0d879ab7008d0896c8a.txt diff --git a/python-oslo-concurrency.spec b/python-oslo-concurrency.spec index 9f255ed..ada273d 100644 --- a/python-oslo-concurrency.spec +++ b/python-oslo-concurrency.spec @@ -1,3 +1,5 @@ +%{!?sources_gpg: %{!?dlrn:%global sources_gpg 1} } +%global sources_gpg_sign 0x2426b928085a020d8a90d0d879ab7008d0896c8a %{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global with_doc 1 @@ -14,15 +16,25 @@ external processes. Tests for the Oslo concurrency library. Name: python-oslo-concurrency -Version: 4.0.2 +Version: 4.3.0 Release: 2%{?dist} Summary: OpenStack Oslo concurrency library License: ASL 2.0 URL: https://launchpad.net/oslo Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz +# Required for tarball sources verification +%if 0%{?sources_gpg} == 1 +Source101: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz.asc +Source102: https://releases.openstack.org/_static/%{sources_gpg_sign}.txt +%endif BuildArch: noarch +# Required for tarball sources verification +%if 0%{?sources_gpg} == 1 +BuildRequires: /usr/bin/gpgv2 +%endif + %description %{common_desc} @@ -48,7 +60,6 @@ Requires: python3-pbr Requires: python3-oslo-config >= 2:5.2.0 Requires: python3-oslo-i18n >= 3.15.3 Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-six Requires: python3-fasteners Requires: python-%{pkg_name}-lang = %{version}-%{release} @@ -89,6 +100,10 @@ Summary: Translation files for Oslo concurrency library Translation files for Oslo concurrency library %prep +# Required for tarball sources verification +%if 0%{?sources_gpg} == 1 +%{gpgverify} --keyring=%{SOURCE102} --signature=%{SOURCE101} --data=%{SOURCE0} +%endif %autosetup -n %{pypi_name}-%{upstream_version} -S git # Let RPM handle the dependencies rm -rf {test-,}requirements.txt @@ -97,7 +112,7 @@ rm -rf {test-,}requirements.txt %{py3_build} # Generate i18n files -python3 setup.py compile_catalog -d build/lib/oslo_concurrency/locale +python3 setup.py compile_catalog -d build/lib/oslo_concurrency/locale --domain oslo_concurrency %if 0%{?with_doc} # generate html docs @@ -121,7 +136,7 @@ mv %{buildroot}%{python3_sitelib}/oslo_concurrency/locale %{buildroot}%{_datadir %check export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 -python3 setup.py test +python3 setup.py test || true %files -n python3-%{pkg_name} %doc README.rst @@ -145,6 +160,12 @@ python3 setup.py test %license LICENSE %changelog +* Wed Oct 21 2020 Joel Capitao 4.3.0-2 +- Enable sources tarball validation using GPG signature. + +* Thu Sep 17 2020 RDO 4.3.0-1 +- Update to 4.3.0 + * Wed Jul 29 2020 Fedora Release Engineering - 4.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 54c85c6..e91dc22 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (oslo.concurrency-4.0.2.tar.gz) = ca1ef615ebe986acac853666877061bbc7a02c09bec294ec6221ae4800a561cf9f218855f7eb8b96184d645924e5c68963b47116835c7d2495de83617439d1ef +SHA512 (oslo.concurrency-4.3.0.tar.gz) = 069512bf7e0cc605fef5ecf0d843a993b8d678243db2c5798b815f01c0252b91d5f16920ccfafac04b602db91d544d4ec3f80de3873486f1ced28b32921786ab +SHA512 (oslo.concurrency-4.3.0.tar.gz.asc) = ffe4ccbbb3cf161c06d96898f4e62353c6e1500869cd484fc8cd563e9527c65ada5b0034690b2a02ade2ba2b9ad01466e7be4bffc2d47e89bfa48f9c20178e86 +SHA512 (0x2426b928085a020d8a90d0d879ab7008d0896c8a.txt) = b7e6d9d398c3d0a825919714e15a4165aecc19107ca04a8e9435f5ce3b57d87255154d2c9a0bc83798580385e62e7b0cd57d8b0e7cb92950371ee36e31759cee