From 32355aeac7cfcab4e3b0701b99cc893fb2d756bf Mon Sep 17 00:00:00 2001 From: Jason Montleon Date: Nov 08 2019 15:46:22 +0000 Subject: update to upstream 10.0.1, add EL8 support --- diff --git a/.gitignore b/.gitignore index dbaa325..f70583b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ /2d69e89dab7134186cbcdaf82381ab6295c6c394.tar.gz /54a0210eed00b16a5a3bd22af0817c31affca3f3.tar.gz /v9.0.1.tar.gz +/474e9fb32293fa05098e920967bb0e0645182d5b.tar.gz +/v10.0.1.tar.gz diff --git a/python-kubernetes.spec b/python-kubernetes.spec index f09ab41..eabfc3d 100644 --- a/python-kubernetes.spec +++ b/python-kubernetes.spec @@ -7,7 +7,7 @@ Patch0: python-kubernetes-el7.patch %else %global py3 python3 -%if 0%{?fedora} < 30 +%if 0%{?fedora} < 30 && 0%{?rhel} < 8 %bcond_without python2 %bcond_without python3 %else @@ -17,10 +17,10 @@ Patch0: python-kubernetes-el7.patch %endif %global library kubernetes -%global basehash 54a0210eed00b16a5a3bd22af0817c31affca3f3 +%global basehash 474e9fb32293fa05098e920967bb0e0645182d5b Name: python-%{library} -Version: 9.0.1 +Version: 10.0.1 Release: 1%{?dist} Summary: Python client for the kubernetes API. License: ASL 2.0 @@ -126,6 +126,14 @@ Python client for the kubernetes API. %prep %autosetup -n python-%{version} -S git + +#This is needed until CentOS 8.1. The dep was +#updated because of a CVE in urllib3 and the +#corresponding package update is in EL 8.1 +%if 0%{?rhel} == 8 +sed -i 's/1.24.2/1.23/g' requirements.txt +%endif + pushd kubernetes rm -rf base tar zxvf %{SOURCE1} @@ -205,6 +213,9 @@ cp -pr kubernetes/e2e_test %{buildroot}%{python3_sitelib}/%{library}/ %endif %changelog +* Fri Nov 08 2019 Jason Montleon 10.0.1-1 +- Update to upstream 10.0.1 + * Fri Oct 18 2019 Jason Montleon 9.0.1-1 - Update to upstream 9.0.1 diff --git a/sources b/sources index 7bfff11..7037978 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (54a0210eed00b16a5a3bd22af0817c31affca3f3.tar.gz) = 564d42e7d252cada9e7658473d8c5448014141cf8a949459d2861a7c3cccfadc08200c956e7f9e65b94559769cb7c67f39da303473cdb97eae84ca1d09799689 -SHA512 (v9.0.1.tar.gz) = d28f3c0986c1c41974d629d7d27c1e838f86b61df299c61a9d47a516b0e969d51bff3916343b164e43d5c1a954284ce6993481ab14c5105015ded0ba78e9613f +SHA512 (474e9fb32293fa05098e920967bb0e0645182d5b.tar.gz) = 8342380ec21633a7c4d061951081c3c57ea9c2a90d3edc6d6f2aa270c3a6878c3c888edd102342fac1c648d6458142be479f187d26820bf810429bdd51342acb +SHA512 (v10.0.1.tar.gz) = 6e985d49278e69223dedc37cabc045328bacd4bdeaeaf1e267749e706b4083131fcb8a98804b8e193ec0889bff43276175dcbc08d85f38895dbe9faa7ab1a1f0 SHA512 (python-kubernetes-el7.patch) = 5891ffa1d5c22e4b96becb6bd80cd4517237a3ba9fd30f748e83a6f170d8a5fda79998857184098e07594a42e8caf0d6bb3f8f5479ea4765048fe5883cf5f669