From f81392a491735eb64e554580470db9f459a8cd3b Mon Sep 17 00:00:00 2001
From: yatin <ykarel@redhat.com>
Date: Jan 31 2019 15:28:45 +0000
Subject: Drop python2 sub packages


---

diff --git a/python-glanceclient.spec b/python-glanceclient.spec
index d9f9007..94084fb 100644
--- a/python-glanceclient.spec
+++ b/python-glanceclient.spec
@@ -2,10 +2,6 @@
 
 %global sname glanceclient
 
-%if 0%{?fedora}
-%global with_python3 1
-%endif
-
 %global common_desc \
 This is a client for the OpenStack Glance API. There's a Python API (the \
 glanceclient module), and a command-line script (glance). Each implements \
@@ -14,7 +10,7 @@ glanceclient module), and a command-line script (glance). Each implements \
 Name:             python-glanceclient
 Epoch:            1
 Version:          2.10.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Python API and CLI for OpenStack Glance
 
 License:          ASL 2.0
@@ -28,34 +24,6 @@ BuildRequires:    git
 %description
 %{common_desc}
 
-%package -n python2-%{sname}
-Summary:          Python API and CLI for OpenStack Glance
-%{?python_provide:%python_provide python2-glanceclient}
-
-BuildRequires:    python2-devel
-BuildRequires:    python2-setuptools
-BuildRequires:    python2-pbr
-
-Requires:         python2-keystoneauth1 >= 3.3.0
-Requires:         python2-oslo-i18n >= 3.15.3
-Requires:         python2-oslo-utils >= 3.33.0
-Requires:         python2-pbr
-Requires:         python2-prettytable
-Requires:         python2-pyOpenSSL >= 16.2.0
-Requires:         python2-requests
-Requires:         python2-six >= 1.10.0
-%if 0%{?fedora} || 0%{?rhel} > 7
-Requires:         python2-warlock
-Requires:         python2-wrapt
-%else
-Requires:         python-warlock
-Requires:         python-wrapt
-%endif
-
-%description -n python2-%{sname}
-%{common_desc}
-
-%if 0%{?with_python3}
 %package -n python3-%{sname}
 Summary:          Python API and CLI for OpenStack Glance
 %{?python_provide:%python_provide python3-glanceclient}
@@ -77,22 +45,17 @@ Requires:         python3-wrapt
 
 %description -n python3-%{sname}
 %{common_desc}
-%endif
 
 %package doc
 Summary:          Documentation for OpenStack Glance API Client
 
-BuildRequires:    python2-sphinx
-BuildRequires:    python2-openstackdocstheme
-BuildRequires:    python2-keystoneauth1
-BuildRequires:    python2-oslo-utils
-BuildRequires:    python2-prettytable
-BuildRequires:    python2-pyOpenSSL >= 16.2.0
-%if 0%{?fedora} || 0%{?rhel} > 7
-BuildRequires:    python2-warlock
-%else
-BuildRequires:    python-warlock
-%endif
+BuildRequires:    python3-sphinx
+BuildRequires:    python3-openstackdocstheme
+BuildRequires:    python3-keystoneauth1
+BuildRequires:    python3-oslo-utils
+BuildRequires:    python3-prettytable
+BuildRequires:    python3-pyOpenSSL >= 16.2.0
+BuildRequires:    python3-warlock
 
 %description      doc
 %{common_desc}
@@ -105,51 +68,23 @@ This package contains auto-generated documentation.
 rm -rf {,test-}requirements.txt
 
 %build
-%py2_build
-%if 0%{?with_python3}
 %py3_build
-%endif
 
 %install
-%if 0%{?with_python3}
 %py3_install
-mv %{buildroot}%{_bindir}/glance %{buildroot}%{_bindir}/glance-%{python3_version}
-ln -s ./glance-%{python3_version} %{buildroot}%{_bindir}/glance-3
 # Delete tests
 rm -fr %{buildroot}%{python3_sitelib}/glanceclient/tests
-%endif
-
-%py2_install
-mv %{buildroot}%{_bindir}/glance %{buildroot}%{_bindir}/glance-%{python2_version}
-ln -s ./glance-%{python2_version} %{buildroot}%{_bindir}/glance-2
-
-ln -s ./glance-2 %{buildroot}%{_bindir}/glance
 
 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
 install -pm 644 tools/glance.bash_completion \
     %{buildroot}%{_sysconfdir}/bash_completion.d/glance
 
-# Delete tests
-rm -fr %{buildroot}%{python2_sitelib}/glanceclient/tests
-
 # generate html docs
-%{__python2} setup.py build_sphinx -b html
+%{__python3} setup.py build_sphinx -b html
 # generate man page
-%{__python2} setup.py build_sphinx -b man
+%{__python3} setup.py build_sphinx -b man
 install -p -D -m 644 doc/build/man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
 
-%files -n python2-%{sname}
-%doc README.rst
-%license LICENSE
-%{python2_sitelib}/glanceclient
-%{python2_sitelib}/*.egg-info
-%{_sysconfdir}/bash_completion.d
-%{_mandir}/man1/glance.1.gz
-%{_bindir}/glance
-%{_bindir}/glance-2
-%{_bindir}/glance-%{python2_version}
-
-%if 0%{?with_python3}
 %files -n python3-%{sname}
 %license LICENSE
 %doc README.rst
@@ -157,15 +92,16 @@ install -p -D -m 644 doc/build/man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
 %{python3_sitelib}/*.egg-info
 %{_sysconfdir}/bash_completion.d
 %{_mandir}/man1/glance.1.gz
-%{_bindir}/glance-3
-%{_bindir}/glance-%{python3_version}
-%endif
+%{_bindir}/glance
 
 %files doc
 %doc doc/build/html
 %license LICENSE
 
 %changelog
+* Wed Jan 31 2019 Yatin Karel <ykarel@redhat.com> 1:2.10.0-2
+- Drop python2 sub package
+
 * Wed Apr 18 2018 RDO <dev@lists.rdoproject.org> 1:2.10.0-1
 - Update to 2.10.0