From d09ea08407e9dd236607a9efb827b580f2272dee Mon Sep 17 00:00:00 2001 From: Joel Capitao Date: Jun 03 2020 13:05:25 +0000 Subject: Sync from RDO ussuri release from python-reno-3.0.1-1.el8 --- diff --git a/.gitignore b/.gitignore index 1d229c7..9864ada 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /reno-2.9.2.tar.gz /reno-2.11.2.tar.gz /reno-2.11.3.tar.gz +/reno-3.0.1.tar.gz diff --git a/python-reno.spec b/python-reno.spec index f5d1e5a..4edad79 100644 --- a/python-reno.spec +++ b/python-reno.spec @@ -1,14 +1,3 @@ -# Macros for py2/py3 compatibility -%if 0%{?fedora} || 0%{?rhel} > 7 -%global pyver %{python3_pkgversion} -%else -%global pyver 2 -%endif -%global pyver_bin python%{pyver} -%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}} -%global pyver_install %{expand:%{py%{pyver}_install}} -%global pyver_build %{expand:%{py%{pyver}_build}} -# End of macros for py2/py3 compatibility %{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global pypi_name reno @@ -25,8 +14,8 @@ of time with many releases can be time consuming and error prone. Reno \ helps automate the hard parts. Name: python-%{pypi_name} -Version: 2.11.3 -Release: 3%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: Release NOtes manager License: ASL 2.0 @@ -37,46 +26,26 @@ BuildArch: noarch %description %{common_desc} -%package -n python%{pyver}-%{pypi_name} +%package -n python3-%{pypi_name} Summary: RElease NOtes manager -%{?python_provide:%python_provide python%{pyver}-%{pypi_name}} -%if %{pyver} == 3 +%{?python_provide:%python_provide python3-%{pypi_name}} Obsoletes: python2-%{pypi_name} < %{version}-%{release} -%endif -BuildRequires: python%{pyver}-devel -BuildRequires: python%{pyver}-dulwich -BuildRequires: python%{pyver}-setuptools -BuildRequires: python%{pyver}-pbr -BuildRequires: python%{pyver}-babel -BuildRequires: python%{pyver}-sphinx -BuildRequires: git - -# Handle python2 exception -%if %{pyver} == 2 -BuildRequires: PyYAML -%else -# Until https://src.fedoraproject.org/rpms/python-dulwich/pull-request/3 is merged, we need this -BuildRequires: python%{pyver}-certifi -BuildRequires: python%{pyver}-PyYAML -%endif +BuildRequires: python3-devel +BuildRequires: python3-dulwich +BuildRequires: python3-setuptools +BuildRequires: python3-pbr +BuildRequires: python3-sphinx -Requires: python%{pyver}-pbr -Requires: python%{pyver}-babel -Requires: python%{pyver}-dulwich -Requires: python%{pyver}-six +BuildRequires: python3-PyYAML + +Requires: python3-pbr +Requires: python3-dulwich Requires: git -# Handle python2 exception -%if %{pyver} == 2 -Requires: PyYAML -%else -Requires: python%{pyver}-PyYAML -# Until https://src.fedoraproject.org/rpms/python-dulwich/pull-request/3 is merged, we need this -Requires: python%{pyver}-certifi -%endif +Requires: python3-PyYAML -%description -n python%{pyver}-%{pypi_name} +%description -n python3-%{pypi_name} %{common_desc} %package -n python-%{pypi_name}-doc @@ -88,24 +57,24 @@ Documentation for reno %autosetup -n %{pypi_name}-%{upstream_version} %build -%{pyver_build} +%{py3_build} %install -%{pyver_install} +%{py3_install} %if 0%{?with_docs} # generate html docs -sphinx-build-%{pyver} doc/source html -# remove the sphinx-build-%{pyver} leftovers +sphinx-build-3 doc/source html +# remove the sphinx-build-3 leftovers rm -rf html/.{doctrees,buildinfo} %endif -%files -n python%{pyver}-%{pypi_name} +%files -n python3-%{pypi_name} %doc README.rst %license LICENSE %{_bindir}/%{pypi_name} -%{pyver_sitelib}/%{pypi_name} -%{pyver_sitelib}/%{pypi_name}-*.egg-info +%{python3_sitelib}/%{pypi_name} +%{python3_sitelib}/%{pypi_name}-*.egg-info %files -n python-%{pypi_name}-doc %if 0%{?with_docs} @@ -114,6 +83,9 @@ rm -rf html/.{doctrees,buildinfo} %license LICENSE %changelog +* Wed Jun 03 2020 Joel Capitao 3.0.1-1 +- Update to upstream version 3.0.1 + * Tue May 26 2020 Miro HronĨok - 2.11.3-3 - Rebuilt for Python 3.9 diff --git a/sources b/sources index a6fdd6e..6125792 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (reno-2.11.3.tar.gz) = 8d5bfe30c7a886d295d77b3d38e7fde09a8febacfacbf984f919bd5c813d81999870684f7da5b3e77a95436c912ea8e275b68548622462218356e23ad084140c +SHA512 (reno-3.0.1.tar.gz) = 8c49d3bc484203aefa4537b938d3d59d32160e267e123547021f2eec2484ae6a6891eb2434a9a94893fd7486306f9da4331222dffc5d0e74204a33db7d19a3a5