From a546dc1646ca874c5f01b608b9e036eaf7bca176 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej(a)redhat.com>
Date: Jan 31 2018 22:11:30 +0000
Subject: Update to 4.0.0
---
diff --git a/.gitignore b/.gitignore
index 8af4511..82dd177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/v1.0.0b3.tar.gz
/v2.0.0.tar.gz
+/v4.0.0.tar.gz
+/a41c44715241552de73361673152f3f0d0bb9bc4.tar.gz
diff --git a/python-kubernetes.spec b/python-kubernetes.spec
index 66207d6..1094575 100644
--- a/python-kubernetes.spec
+++ b/python-kubernetes.spec
@@ -1,4 +1,3 @@
-%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
# Python3 support in OpenStack starts with version 3.5,
# which is only in Fedora 24+
@@ -6,18 +5,19 @@
%global with_python3 1
%endif
+%global base_commit a41c44715241552de73361673152f3f0d0bb9bc4
%global library kubernetes
Name: python-%{library}
-Version: 2.0.0
-Release: 2%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
Summary: Python client for the kubernetes API.
License: ASL 2.0
URL:
https://pypi.python.org/pypi/kubernetes
-Source0:
https://github.com/kubernetes-incubator/client-python/archive/v%{upstream...
-
+Source0:
https://github.com/kubernetes-incubator/client-python/archive/v%{version}...
+Source1:
https://github.com/kubernetes-client/python-base/archive/%{base_commit}.t...
BuildArch: noarch
%package -n python2-%{library}
@@ -26,28 +26,41 @@ Summary: Kubernetes Python Client
BuildRequires: git
BuildRequires: python2-devel
-BuildRequires: python-nose
-BuildRequires: python-py
-BuildRequires: python-mock
-BuildRequires: python-certifi
-BuildRequires: python-six
-BuildRequires: python-dateutil
-BuildRequires: python-setuptools
-BuildRequires: python-urllib3
+BuildRequires: python2-nose
+BuildRequires: python2-py
+BuildRequires: python2-mock
+BuildRequires: python2-certifi
+BuildRequires: python2-six
+BuildRequires: python2-dateutil
+BuildRequires: python2-requests
+BuildRequires: python2-setuptools
+BuildRequires: python2-urllib3
+BuildRequires: python2-google-auth
BuildRequires: PyYAML
-BuildRequires: python-oauth2client
+%if 0%{?fedora} > 0
+BuildRequires: python2-ipaddress
+BuildRequires: python2-websocket-client
+%else
BuildRequires: python-ipaddress
BuildRequires: python-websocket-client
+%endif
-Requires: python-certifi
-Requires: python-six
-Requires: python-dateutil
-Requires: python-setuptools
-Requires: python-urllib3
+Requires: python2-certifi
+Requires: python2-six
+Requires: python2-dateutil
+Requires: python2-setuptools
+Requires: python2-urllib3
+Requires: python2-google-auth
+Requires: python2-requests
+Requires: python2-requests-oauthlib
Requires: PyYAML
-Requires: python-oauth2client
+%if 0%{?fedora} > 0
+Requires: python2-ipaddress
+Requires: python2-websocket-client
+%else
Requires: python-ipaddress
Requires: python-websocket-client
+%endif
%description -n python2-%{library}
Python client for the kubernetes API.
@@ -56,9 +69,9 @@ Python client for the kubernetes API.
%package -n python2-%{library}-tests
Summary: Tests python-kubernetes library
-Requires: python-nose
-Requires: python-py
-Requires: python-mock
+Requires: python2-nose
+Requires: python2-py
+Requires: python2-mock
Requires: python2-%{library} = %{version}-%{release}
@@ -77,10 +90,11 @@ BuildRequires: python3-mock
BuildRequires: python3-certifi
BuildRequires: python3-six
BuildRequires: python3-dateutil
+BuildRequires: python3-requests
BuildRequires: python3-setuptools
BuildRequires: python3-urllib3
BuildRequires: python3-PyYAML
-BuildRequires: python3-oauth2client
+BuildRequires: python3-google-auth
BuildRequires: python3-websocket-client
Requires: python3-certifi
@@ -89,8 +103,10 @@ Requires: python3-dateutil
Requires: python3-setuptools
Requires: python3-urllib3
Requires: python3-PyYAML
-Requires: python3-oauth2client
+Requires: python3-google-auth
Requires: python3-websocket-client
+Requires: python3-requests
+Requires: python3-requests-oauthlib
%description -n python3-%{library}
Python client for the kubernetes API.
@@ -116,9 +132,13 @@ Tests python-kubernetes library
Python client for the kubernetes API.
%prep
-%autosetup -n client-python-%{upstream_version} -S git
+%autosetup -n python-%{version} -S git
-# Let's handle dependencies ourseleves
+pushd kubernetes
+rm -rf base
+tar zxvf %{SOURCE1}
+mv python-base-%{base_commit} base
+popd
%build
%py2_build
@@ -180,6 +200,12 @@ cp -pr kubernetes/e2e_test
%{buildroot}%{python3_sitelib}/%{library}/
%endif # with_python3
%changelog
+* Wed Jan 31 2018 Jason Montleon <jmontleo(a)redhat.com> 4.0.0-1
+- Update to 4.0.0
+
+* Fri Oct 13 2017 Jason Montleon <jmontleo(a)redhat.com> 3.0.0-1
+- Update to 3.0.0
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/sources b/sources
index 6a6042f..fa9e8ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.0.0.tar.gz) =
684a27707f9d1d6611eb9ecd0e47098014ac5570f84c265756b197f333900bd37fb622a0cb99120571789d3c1ad57f9c5d9d257e50a5f3c675ae9d18c9b33378
+SHA512 (a41c44715241552de73361673152f3f0d0bb9bc4.tar.gz) =
9d320eee6d78a66df06b412b253874a25ae734faa3b69cd96671f0f8ad49857b91d53197d41e68ce29f3018cfd033dc8cd8f047ea7d68eb4e4bd82ca28d2a796
https://src.fedoraproject.org/rpms/python-kubernetes/c/a546dc1646ca874c5f...