[rpms/python-aodhclient] epel10: Sync w/ RDO

[rpms/python-aodhclient] epel10: Sync w/ RDO

[Haikel Guemar]

            A new commit has been pushed.

            Repo   : rpms/python-aodhclient
            Branch : epel10
            Commit : e74af15ce194124ff4e30ef987c21791b2979302
            Author : Haikel Guemar <hguemar@fedoraproject.org>
            Date   : 2016-08-17T16:02:27+02:00
            Stats  : +41/-68 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-aodhclient/c/e74af15ce194124ff4e30ef987c21791b2979302?branch=epel10

            Log:
            Sync w/ RDO

Change-Id: I1ac1c8532282dee952fb3e8389d27160c1466390

---
diff --git a/python-aodhclient.spec b/python-aodhclient.spec
index 2b62959..562c1a4 100644
--- a/python-aodhclient.spec
+++ b/python-aodhclient.spec
@@ -1,57 +1,56 @@
-%{!?python2_shortver: %global python2_shortver %(%{__python2} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
-%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
-
 %global pypi_name aodhclient
 
-%if 0%{?fedora} >= 24
+%if 0%{?fedora}
 %global with_python3 1
 %endif
 
+%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
+
 Name:             python-aodhclient
 Version:          0.5.0
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Python API and CLI for OpenStack Aodh
 
 License:          ASL 2.0
-URL:              https://github.com/openstack/%{name}
-Source0:          https://pypi.python.org/packages/source/a/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+URL:              https://launchpad.net/python-aodhclient
+Source0:          https://pypi.io/packages/source/a/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 
 BuildArch:        noarch
 
+%description
+This is a client library for Aodh built on the Aodh API. It
+provides a Python API (the aodhclient module) and a command-line tool.
 
 %package -n python2-%{pypi_name}
 Summary:          Python API and CLI for OpenStack Aodh
-%{?python_provide:%python_provide python2-aodhclient}
-
+%{?python_provide:%python_provide python2-%{pypi_name}}
 
 BuildRequires:    python-setuptools
 BuildRequires:    python2-devel
 BuildRequires:    python-pbr
-BuildRequires:    python-tools
 
-Requires:         python-babel >= 1.3
+Requires:         python-pbr
 Requires:         python-cliff >= 1.14.0
 Requires:         python-oslo-i18n >= 1.5.0
 Requires:         python-oslo-serialization >= 1.4.0
 Requires:         python-oslo-utils >= 2.0.0
 Requires:         python-keystoneauth1 >= 1.0.0
 Requires:         python-six >= 1.9.0
-Requires:         python-futurist
-
+Requires:         python-debtcollector
 
 %description -n python2-%{pypi_name}
 This is a client library for Aodh built on the Aodh API. It
 provides a Python API (the aodhclient module) and a command-line tool.
 
 
-%package -n python-%{pypi_name}-doc
+%package  doc
 Summary:          Documentation for OpenStack Aodh API Client
 
 BuildRequires:    python-sphinx
 BuildRequires:    python-oslo-sphinx
 
 
-%description -n python-%{pypi_name}-doc
+%description doc
 This is a client library for Aodh built on the Aodh API. It
 provides a Python API (the aodhclient module) and a command-line tool
 (aodh).
@@ -73,19 +72,18 @@ Summary:          Python API and CLI for OpenStack Aodh
 
 %{?python_provide:%python_provide python3-%{pypi_name}}
 
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-pbr >= 0.6
-BuildRequires:  python3-tools
+BuildRequires:    python3-setuptools
+BuildRequires:    python3-devel
+BuildRequires:    python3-pbr
 
-Requires:         python3-babel >= 1.3
+Requires:         python3-pbr
 Requires:         python3-cliff >= 1.14.0
 Requires:         python3-oslo-i18n >= 1.5.0
 Requires:         python3-oslo-serialization >= 1.4.0
 Requires:         python3-oslo-utils >= 2.0.0
 Requires:         python3-keystoneauth1 >= 1.0.0
 Requires:         python3-six >= 1.9.0
-Requires:         python3-futurist
+Requires:         python3-debtcollector
 
 %description -n python3-%{pypi_name}
 This is a client library for Aodh built on the Aodh API. It
@@ -99,99 +97,74 @@ Requires:         python3-%{pypi_name} = %{version}-%{release}
 This is a client library for Aodh built on the Aodh API. It
 provides a Python API (the aodhclient module) and a command-line tool.
 
-
 %endif
 
-%description
-This is a client library for Aodh built on the Aodh API. It
-provides a Python API (the aodhclient module) and a command-line tool.
-
-
-
 %prep
-%setup -q -n %{pypi_name}-%{version}
-
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-2to3 --write --nobackups %{py3dir}
-%endif
+%setup -q -n %{pypi_name}-%{upstream_version}
 
 # Let RPM handle the requirements
 rm -f {,test-}requirements.txt
 
+
 %build
 %py2_build
 %if 0%{?with_python3}
-pushd %{py3dir}
-LANG=en_US.UTF-8 %{__python3} setup.py build
-popd
+%py3_build
 %endif
 
-
 %install
 %if 0%{?with_python3}
-pushd %{py3dir}
-LANG=en_US.UTF-8 %{__python3} setup.py install --skip-build --root %{buildroot}
-mv %{buildroot}%{_bindir}/aodh %{buildroot}%{_bindir}/python3-aodh
-popd
+%py3_install
+mv %{buildroot}%{_bindir}/aodh %{buildroot}%{_bindir}/aodh-%{python3_version}
+ln -s ./aodh-%{python3_version} %{buildroot}%{_bindir}/aodh-3
 %endif
 
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%py2_install
+mv %{buildroot}%{_bindir}/aodh %{buildroot}%{_bindir}/aodh-%{python2_version}
+ln -s ./aodh-%{python2_version} %{buildroot}%{_bindir}/aodh-2
 
-# rename binaries, make compat symlinks
-install -m 755 -d %{buildroot}/%{_bindir}
-pushd %{buildroot}%{_bindir}
-#ln -s aodh aodh
-for i in aodh-{2,%{?python2_shortver}}; do
-    ln -s aodh $i
-done
-%if 0%{?with_python3}
-for i in aodh-{3,%{?python3_shortver}}; do
-    ln -s  python3-aodh $i
-done
-%endif
-popd
+ln -s ./aodh-2 %{buildroot}%{_bindir}/aodh
 
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
 sphinx-build -b html doc/source html
 
-
 %files -n python2-%{pypi_name}
 %doc README.rst
 %license LICENSE
-%{_bindir}/aodh
-%{_bindir}/aodh-2*
 %{python2_sitelib}/aodhclient
 %{python2_sitelib}/*.egg-info
+%{_bindir}/aodh
+%{_bindir}/aodh-2
+%{_bindir}/aodh-%{python2_version}
 %exclude %{python2_sitelib}/aodhclient/tests
 
 %files -n python2-%{pypi_name}-tests
 %license LICENSE
 %{python2_sitelib}/aodhclient/tests
 
-
 %if 0%{?with_python3}
 %files -n python3-%{pypi_name}
-%doc README.rst
 %license LICENSE
-%{_bindir}/python3-aodh
-%{_bindir}/aodh-3*
-%{python3_sitelib}/aodhclient
+%doc README.rst
+%{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/*.egg-info
+%{_bindir}/aodh-3
+%{_bindir}/aodh-%{python3_version}
 %exclude %{python3_sitelib}/aodhclient/tests
 
 %files -n python3-%{pypi_name}-tests
 %license LICENSE
 %{python3_sitelib}/aodhclient/tests
-
 %endif
 
-%files -n python-%{pypi_name}-doc
-%license LICENSE
+%files doc
 %doc html
+%license LICENSE
 
 %changelog
+* Wed Aug 17 2016 Haïkel Guémar <hguemar@fedoraproject.org> - 0.5.0-4
+- Sync with RDO spec
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.0-3
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages