From 5c0c6a791145990ffbc12864ccd924dbf386e839 Mon Sep 17 00:00:00 2001
From: Gris Ge <fge@redhat.com>
Date: Sat, 13 Jul 2019 07:41:03 +0800
Subject: [PATCH] Upgrade to 0.14.3 and removed python2 stuff

Signed-off-by: Gris Ge <fge@redhat.com>
---
 .gitignore  |  1 +
 pywbem.spec | 80 ++++-------------------------------------------------
 sources     |  2 +-
 3 files changed, 8 insertions(+), 75 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6559bfe..0cf0eda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /0.12.3.tar.gz
 /pywbem-0.12.4.tar.gz
 /pywbem-0.12.6.tar.gz
+/pywbem-0.14.3.tar.gz
diff --git a/pywbem.spec b/pywbem.spec
index 2ce0cc3..f7878ae 100644
--- a/pywbem.spec
+++ b/pywbem.spec
@@ -1,30 +1,18 @@
 %{?python_enable_dependency_generator}
-%global py2_build_dir %{_builddir}/%{name}-%{version}-%{release}-python2
-
-%if 0%{?rhel} > 7 || 0%{?fedora} > 28
-%bcond_with  python2
-%else
-%bcond_without     python2
-%endif
 
 Name:           pywbem
-Version:        0.12.6
-Release:        3%{?dist}
+Version:        0.14.3
+Release:        1%{?dist}
 Summary:        Python WBEM client interface and related utilities
 License:        LGPLv2
 URL:            https://github.com/pywbem/pywbem
 Source0:        https://github.com/pywbem/pywbem/archive/v%{version}/%{name}-%{version}.tar.gz
-%if %{with python2}
-BuildRequires:  python2-pip python2-pbr
-BuildRequires:  python2-pyyaml python2-ply python2-rpm-macros
-BuildRequires:  python2-devel
-%endif
 BuildRequires:  python3-pip python3-PyYAML python3-ply python3-rpm-macros
 BuildRequires:  python3-pbr
 BuildRequires:  python3-devel
 BuildArch:      noarch
 
-%global _description\
+%description
 A Python library for making CIM (Common Information Model) operations over HTTP\
 using the WBEM CIM-XML protocol. It is based on the idea that a good WBEM\
 client should be easy to use and not necessarily require a large amount of\
@@ -38,20 +26,6 @@ at http://www.dmtf.org/standards/wbem.\
 It also provides a Python provider interface, and is the fastest and\
 easiest way to write providers on the planet.
 
-%description %_description
-
-%if %{with python2}
-%package -n python2-pywbem
-Summary: %summary
-Requires:       m2crypto python2-pyyaml python2-six python2-ply
-Requires:       python2-mock python2-pbr
-%{?python_provide:%python_provide python2-pywbem}
-Provides: pywbem%{?_isa} = %{version}-%{release}
-Obsoletes: pywbem < %{version}-%{release}
-
-%description -n python2-pywbem %_description
-%endif
-
 %package -n python3-pywbem
 Summary:        Python3 WBEM Client and Provider Interface
 BuildArch:      noarch
@@ -63,65 +37,20 @@ and DSP0201. The CIM/WBEM infrastructure is used for a wide variety of systems
 management tasks supported by systems running WBEM servers. See WBEM Standards
 for more information about WBEM.
 
-%if %{with python2}
-%package twisted
-Summary:        WBEM client bindings for Twisted Python
-Requires:       python2-twisted
-Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
-
-%description twisted
-This module contains factory classes that produce WBEM5Client instances
-that perform WBEM requests over HTTP using the
-twisted.protocols.http.HTTPClient base class.
-%endif
-
 %prep
 %setup -q -n %{name}-%{version}
 
 %build
-%if %{with python2}
-cp -a . %{py2_build_dir}
-%endif
 PBR_VERSION="%{version}" CFLAGS="%{optflags}" %{__python3} setup.py build
 
 
-%if %{with python2}
-pushd %{py2_build_dir}
-PBR_VERSION="%{version}" CFLAGS="%{optflags}" %{__python2} setup.py build
-popd
-%endif
-
 %install
 rm -rf %{buildroot}
-%if %{with python2}
-pushd %{py2_build_dir}
-env PYTHONPATH=%{buildroot}/%{python2_sitelib} \
-    PBR_VERSION="%{version}" \
-    %{__python2} setup.py install -O1 --skip-build --root %{buildroot}
-install -m644 attic/twisted_client.py  \
-    %{buildroot}/%{python2_sitelib}/pywbem/twisted_client.py
-rm -rf %{buildroot}/usr/bin/
-popd
-%endif
-
 env PYTHONPATH=%{buildroot}/%{python3_sitelib} \
     PBR_VERSION="%{version}" \
     %{__python3} setup.py install -O1 --skip-build --root %{buildroot}
 rm -rf %{buildroot}/usr/bin/*.bat
 
-
-%if %{with python2}
-%files -n python2-pywbem
-%license LICENSE.txt
-%{python2_sitelib}/*.egg-info
-%{python2_sitelib}/pywbem/
-%{python2_sitelib}/pywbem_mock/
-
-%files twisted
-%{python2_sitelib}/pywbem/twisted_client.py*
-%endif
-
 %files -n python3-pywbem
 %license LICENSE.txt
 %{python3_sitelib}/*.egg-info
@@ -133,6 +62,9 @@ rm -rf %{buildroot}/usr/bin/*.bat
 %doc README.rst
 
 %changelog
+* Sat Jul 13 2019 Gris Ge <fge@redhat.com> - 0.14.3-1
+- Upgrade to 0.14.3 and removed python2 stuff
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 0517ac4..adbeb8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pywbem-0.12.6.tar.gz) = 2b722b944f29bfe3a5b18de9a0193b9bc156e46cc6bde0bf17782f816ff93fafe557b2a9326268e03a656bdf4e5d5c1efe0e25c8b636704af96492e843ed6e43
+SHA512 (pywbem-0.14.3.tar.gz) = 07a880c81c35d26b67d74f6170b51ceeda8f6490eea2b1c13585216a87db45b7a55aa7e07460a166186a4742a8f36b0d5868883b4a90c6616091d7487a0e27c8