diff --git a/python-oauth2client.spec b/python-oauth2client.spec
index e4ee6ef..7e1f314 100644
--- a/python-oauth2client.spec
+++ b/python-oauth2client.spec
@@ -1,4 +1,5 @@
-%global realname oauth2client
+%global srcname oauth2client
+%global sum Python client library for OAuth 2.0
 # Share doc between python- and python3-
 %global _docdir_fmt %{name}
 
@@ -9,32 +10,32 @@
 %bcond_with python3
 %endif
 
-Name:           python-%{realname}
+Name:           python-%{srcname}
 Version:        1.5.2
-Release:        1%{?dist}
-Summary:        Python client library for OAuth 2.0
+Release:        2%{?dist}
+Summary:        %{sum}
 
 Group:          Development/Languages
 License:        ASL 2.0
-URL:            https://github.com/google/oauth2client
-Source0:        https://github.com/google/%{realname}/archive/v%{version}.tar.gz#/%{realname}-%{version}.tar.gz
+URL:            https://github.com/google/%{srcname}
+Source0:        https://github.com/google/%{srcname}/archive/v%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
 Patch0:         remove-python-shebang-from-module.patch
 Patch1:         docs-build-fix.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
-BuildRequires:  python-setuptools
+BuildRequires:  python2-setuptools
 # Needed for docs build
 BuildRequires:  pyOpenSSL
 BuildRequires:  python-django
 BuildRequires:  python-flask
-BuildRequires:  python-gflags
+BuildRequires:  python2-gflags
 BuildRequires:  python-httplib2 >= 0.9.1
 BuildRequires:  python-keyring
 BuildRequires:  python-pyasn1 >= 0.1.7
 BuildRequires:  python-pyasn1-modules >= 0.0.5
 BuildRequires:  python-rsa >= 3.1.4
-BuildRequires:  python-six >= 1.6.1
+BuildRequires:  python2-six >= 1.6.1
 BuildRequires:  python-sphinx > 1.3
 BuildRequires:  python-sphinx_rtd_theme
 %if %{with python3}
@@ -42,33 +43,41 @@ BuildRequires:  python3-setuptools
 BuildRequires:  python3-devel
 %endif
 
+%description
+This is a python client module for accessing resources protected by OAuth 2.0
+
+%package -n python2-%{srcname}
+Summary:        %{sum}
+%{?python_provide:%python_provide python2-%{srcname}}
+
 Requires:       pyOpenSSL
-Requires:       python-gflags
+Requires:       python2-gflags
 Requires:       python-httplib2 >= 0.9.1
 Requires:       python-keyring
 Requires:       python-pyasn1 >= 0.1.7
 Requires:       python-pyasn1-modules >= 0.0.5
 Requires:       python-rsa >= 3.1.4
-Requires:       python-six >= 1.6.1
+Requires:       python2-six >= 1.6.1
 
-
-%description
+%description -n python2-%{srcname}
 This is a python client module for accessing resources protected by OAuth 2.0
 
+
 %if %{with python3}
-%package -n python3-%{realname}
-Summary:        Python client library for OAuth 2.0
+%package -n python3-%{srcname}
+Summary:        %{sum}
+%{?python_provide:%python_provide python3-%{srcname}}
 
 Requires:       python3-pyOpenSSL
 Requires:       python3-gflags
-Requires:       python3-httplib2
+Requires:       python3-httplib2 >= 0.9.1
 Requires:       python3-keyring
-Requires:       python3-pyasn1
-Requires:       python3-pyasn1-modules
-Requires:       python3-rsa
-Requires:       python3-six
+Requires:       python3-pyasn1 >= 0.1.7
+Requires:       python3-pyasn1-modules >= 0.0.5
+Requires:       python3-rsa >= 3.1.4
+Requires:       python3-six >= 1.6.1
 
-%description -n python3-%{realname}
+%description -n python3-%{srcname}
 This is a python client module for accessing resources protected by OAuth 2.0
 %endif
 
@@ -80,7 +89,7 @@ The python-oauth2client-doc package provides the documentation
 for the package. Documentation is shipped in html format.
 
 %prep
-%setup -q -n %{realname}-%{version}
+%setup -q -n %{srcname}-%{version}
 %patch0 -p1 
 %patch1 -p1 
 
@@ -94,7 +103,7 @@ cp -a . %{py3dir}
 %endif
 
 %build
-%{__python2} setup.py build
+%py2_build
 export PYTHONPATH=`pwd`
 pushd docs
 # Not running with smp_flags as sometimes sphinx fails when run
@@ -109,34 +118,34 @@ rm -fv docs/_build/html/{.buildinfo,objects.inv}
 
 %if %{with python3}
 pushd %{py3dir}
-%{__python3} setup.py build
+%py3_build
 popd
 %endif
 
 %install
-%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
+%py2_install
 
 %if %{with python3}
 pushd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+%py3_install
 popd
 %endif
 
-%files
+%files -n python2-%{srcname}
 %license LICENSE
 %doc CHANGELOG.md CONTRIBUTING.md README.md 
-%{python2_sitelib}/%{realname}
-%{python2_sitelib}/%{realname}-%{version}-*.egg-info
+%{python2_sitelib}/%{srcname}
+%{python2_sitelib}/%{srcname}-%{version}-*.egg-info
 
 %files doc
 %doc docs/_build/html
 
 %if %{with python3}
-%files -n python3-%{realname}
+%files -n python3-%{srcname}
 %license LICENSE 
 %doc CHANGELOG.md CONTRIBUTING.md README.md 
-%{python3_sitelib}/%{realname}
-%{python3_sitelib}/%{realname}*.egg-info
+%{python3_sitelib}/%{srcname}
+%{python3_sitelib}/%{srcname}*.egg-info
 %endif
 
 %changelog