New upstream

Disable keyring requires as python-keyring is gone

python-oauth2client.spec

@@ -11,8 +11,8 @@
 %endif
 
 Name:           python-%{srcname}
-Version:        4.1.2
+Version:        4.1.3
-Release:        7%{?dist}
+Release:        1%{?dist}
 Summary:        %{sum}
 
 Group:          Development/Languages
@@ -20,6 +20,8 @@ License:        ASL 2.0
 URL:            https://github.com/google/%{srcname}
 Source0:        https://github.com/google/%{srcname}/archive/v%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
 Patch0:         docs-build-fix.patch
+Patch1:         doc-fix.patch
+Patch2:         keyring-remove.patch
 
 BuildArch:      noarch
 BuildRequires:  %{_bindir}/tox
@@ -32,7 +34,6 @@ BuildRequires:  python-jsonpickle
 BuildRequires:  python-flask
 BuildRequires:  python2-gflags
 BuildRequires:  python-httplib2
-BuildRequires:  python-keyring
 BuildRequires:  python-mock
 BuildRequires:  python-nose
 BuildRequires:  python2-pyasn1 >= 0.1.7
@@ -81,7 +82,6 @@ Summary:        %{sum}
 Requires:       pyOpenSSL
 Requires:       python2-gflags
 Requires:       python-httplib2
-Requires:       python-keyring
 Requires:       python2-pyasn1 >= 0.1.7
 Requires:       python2-pyasn1-modules >= 0.0.5
 Requires:       python-rsa >= 3.1.4
@@ -108,7 +108,6 @@ Requires:       python3-pyOpenSSL
 Requires:       python3-gflags
 Requires:       python3-fasteners
 Requires:       python3-httplib2 >= 0.9.1
-Requires:       python3-keyring
 Requires:       python3-pyasn1 >= 0.1.7
 Requires:       python3-pyasn1-modules >= 0.0.5
 Requires:       python3-rsa >= 3.1.4
@@ -128,6 +127,8 @@ for the package. Documentation is shipped in html format.
 %prep
 %setup -q -n %{srcname}-%{version}
 %patch0 -p1 -b .doc
+%patch1 -p1 -b .doc2
+%patch2 -p1 -b .keyring
 
 # Remove the version constraint on httplib2.  From reading upstream's git log,
 # it seems the only reason they require a new version is to force python3
@@ -138,6 +139,10 @@ sed -i 's/httplib2>=0.9.1/httplib2/' setup.py
 # This is removed because it breaks the docs build otherwise
 rm -f docs/source/oauth2client.contrib.appengine.rst oauth2client/appengine.py
 
+# Remove keyring support
+rm oauth2client/contrib/keyring_storage.py tests/contrib/test_keyring_storage.py docs/source/oauth2client.contrib.keyring_storage.rst
+
+
 %if %{with python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
@@ -218,6 +223,10 @@ rm -r $(find %{_buildrootdir} -type d -name 'tests') || /bin/true
 %endif
 
 %changelog
+* Mon Jan 21 2019 Michele Baldessari <michele@acksyn.org> - 4.1.3-1
+- New upstream
+- Disable keyring requires as python-keyring is gone
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild