diff --git a/.gitignore b/.gitignore index 23099f1..3c7deb8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /reno-1.8.0.tar.gz /reno-2.0.3.tar.gz /reno-2.9.2.tar.gz +/reno-2.11.2.tar.gz diff --git a/python-reno.spec b/python-reno.spec index ca5a041..9d2b0e7 100644 --- a/python-reno.spec +++ b/python-reno.spec @@ -1,3 +1,14 @@ +# 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 %python%{pyver}_sitelib +%global pyver_install %py%{pyver}_install +%global pyver_build %py%{pyver}_build +# End of macros for py2/py3 compatibility %{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global pypi_name reno @@ -14,9 +25,9 @@ of time with many releases can be time consuming and error prone. Reno \ helps automate the hard parts. Name: python-%{pypi_name} -Version: 2.9.2 -Release: 5%{?dist} -Summary: RElease NOtes manager +Version: 2.11.2 +Release: 1%{?dist} +Summary: Release NOtes manager License: ASL 2.0 URL: http://www.openstack.org/ @@ -26,64 +37,75 @@ BuildArch: noarch %description %{common_desc} -%package -n python3-%{pypi_name} +%package -n python%{pyver}-%{pypi_name} Summary: RElease NOtes manager -%{?python_provide:%python_provide python3-%{pypi_name}} +%{?python_provide:%python_provide python%{pyver}-%{pypi_name}} +%if %{pyver} == 3 Obsoletes: python2-%{pypi_name} < %{version}-%{release} +%endif -BuildRequires: python3-devel -BuildRequires: python3-dulwich -# Until https://src.fedoraproject.org/rpms/python-dulwich/pull-request/3 is merged, we need this -BuildRequires: python3-certifi -BuildRequires: python3-setuptools -BuildRequires: python3-pbr -BuildRequires: python3-babel -BuildRequires: python3-sphinx -BuildRequires: python3-PyYAML +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 -Requires: python3-pbr -Requires: python3-babel -Requires: python3-dulwich +# 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 -Requires: python3-certifi -Requires: python3-PyYAML -Requires: python3-six -Requires: git +BuildRequires: python%{pyver}-certifi +BuildRequires: python%{pyver}-PyYAML +%endif + +Requires: python%{pyver}-pbr +Requires: python%{pyver}-babel +Requires: python%{pyver}-dulwich +Requires: python%{pyver}-six +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 -%description -n python3-%{pypi_name} +%description -n python%{pyver}-%{pypi_name} %{common_desc} %package -n python-%{pypi_name}-doc -Summary: Reno documentation +Summary: reno documentation %description -n python-%{pypi_name}-doc -Documentation for Reno +Documentation for reno %prep %autosetup -n %{pypi_name}-%{upstream_version} %build -%py3_build +%{pyver_build} %install -%py3_install - -ln -s ./%{pypi_name} %{buildroot}%{_bindir}/python3-%{pypi_name} +%{pyver_install} %if 0%{?with_docs} # generate html docs -sphinx-build-3 doc/source html -# remove the sphinx-build leftovers +sphinx-build-%{pyver} doc/source html +# remove the sphinx-build-%{pyver} leftovers rm -rf html/.{doctrees,buildinfo} %endif -%files -n python3-%{pypi_name} +%files -n python%{pyver}-%{pypi_name} %doc README.rst %license LICENSE %{_bindir}/%{pypi_name} -%{_bindir}/python3-%{pypi_name} -%{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/%{pypi_name}-*.egg-info +%{pyver_sitelib}/%{pypi_name} +%{pyver_sitelib}/%{pypi_name}-*.egg-info %files -n python-%{pypi_name}-doc %if 0%{?with_docs} @@ -92,78 +114,6 @@ rm -rf html/.{doctrees,buildinfo} %license LICENSE %changelog -* Wed Feb 27 2019 Yatin Karel - 2.9.2-5 -- Drop python2 package - -* Sat Feb 02 2019 Fedora Release Engineering - 2.9.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.9.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 2.9.2-2 -- Rebuilt for Python 3.7 - -* Mon Jun 18 2018 Alan Pevec 2.9.2-1 -- Update to 2.9.2 - -* Fri Feb 09 2018 Iryna Shcherbina - 2.0.3-5 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Feb 09 2018 Fedora Release Engineering - 2.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Dec 23 2016 Alan Pevec 2.0.3-1 -- Update to 2.0.3 - -* Mon Dec 19 2016 Miro Hrončok - 1.8.0-2 -- Rebuild for Python 3.6 - -* Tue Sep 13 2016 Alan Pevec 1.8.0-1 -- Update to 1.8.0 - -* Tue Jul 19 2016 Fedora Release Engineering - 1.6.2-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Thu Apr 07 2016 Haikel Guemar 1.6.2-1 -- Update to 1.6.2 - -* Tue Mar 15 2016 Paul Belanger - 1.6.0-1 -- New upstream 1.6.0 release - -* Thu Feb 18 2016 Paul Belanger - 1.5.0-1 -- New upstream 1.5.0 release -- Fix rpmlint spelling-error warnings - -* Thu Feb 04 2016 Fedora Release Engineering - 1.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sun Jan 24 2016 Haïkel Guémar - 1.3.1-2 -- Simplify macros and reno CLI generation -- Fix build on EL7 - -* Fri Jan 22 2016 Paul Belanger 1.3.1-1 -- New upstream 1.3.1 release -- Switch to setup.py build_sphinx to keep inline with upstream documentation - builds -- Various rpmlint fixes - -* Tue Nov 10 2015 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Thu Nov 5 2015 Toshio Kuratomi - 0.1.0-3 -- Ship the reno script against python3 to comply with the python guidelines and - solve the issue of the python3 package depending on /usr/bin/python2 - -* Wed Sep 30 2015 Chandan Kumar -0.1.0-2 -- Some cosmetic changes in spec file +* Fri Mar 08 2019 RDO 2.11.2-1 +- Update to 2.11.2 -* Wed Sep 30 2015 Chandan Kumar - 0.1.0-1 -- Initial Package diff --git a/sources b/sources index c0cfa80..e7e9c96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (reno-2.9.2.tar.gz) = 123c200457e43a36ce6047e0b919cb5ead1415ebe53a511082bc6093d59555ff1979f13972886257e1f6d0ecad0f7ec8bd3fd65cbf1a4b68b080d32e424da4f1 +SHA512 (reno-2.11.2.tar.gz) = b2ef0d9112e327d3a581bfe9b4d6e47b7b4edaa3fe463716772438aab0dcee445d94aaa93bfc7036ead297206353ade73a34d148521ef5d25abe9ca5e655a13f