diff --git a/.gitignore b/.gitignore index 1aa4176..dc25b09 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /v0.9.1.tar.gz /v0.10.0.tar.gz /v0.11.0.tar.gz +/0.12.2.tar.gz diff --git a/pywbem.spec b/pywbem.spec index d4c4b81..ff44f15 100644 --- a/pywbem.spec +++ b/pywbem.spec @@ -1,21 +1,17 @@ %global py3_build_dir %{_builddir}/%{name}-%{version}-%{release}-python3 Name: pywbem -Version: 0.11.0 -Release: 6%{?dist} +Version: 0.12.2 +Release: 1%{?dist} Summary: Python2 WBEM Client and Provider Interface Group: Development/Libraries License: LGPLv2 URL: https://github.com/pywbem/pywbem -Source0: https://github.com/pywbem/pywbem/archive/v%{version}.tar.gz -%if 0%{?fedora} >= 26 +Source0: https://github.com/pywbem/pywbem/archive/%{version}.tar.gz BuildRequires: python2-pip -%else -BuildRequires: python2-pip -%endif - BuildRequires: python2-pyyaml python2-ply python2-rpm-macros BuildRequires: python3-pip python3-PyYAML python3-ply python3-rpm-macros +BuildRequires: python3-pbr python2-pbr BuildArch: noarch %global _description\ @@ -74,32 +70,40 @@ twisted.protocols.http.HTTPClient base class. %build cp -a . %{py3_build_dir} -CFLAGS="%{optflags}" %{__python2} setup.py build +PBR_VERSION="%{version}" CFLAGS="%{optflags}" %{__python2} setup.py build pushd %{py3_build_dir} -CFLAGS="%{optflags}" %{__python3} setup.py build +PBR_VERSION="%{version}" CFLAGS="%{optflags}" %{__python3} setup.py build popd %install rm -rf %{buildroot} -env PYTHONPATH=%{buildroot}/%{python2_sitelib} %{__python2} setup.py install -O1 --skip-build --root %{buildroot} +env PYTHONPATH=%{buildroot}/%{python2_sitelib} \ + PBR_VERSION="%{version}" \ + %{__python2} setup.py install -O1 --skip-build --root %{buildroot} rm -rf %{buildroot}/usr/bin/ -install -m644 attic/twisted_client.py %{buildroot}/%{python2_sitelib}/pywbem/twisted_client.py +install -m644 attic/twisted_client.py \ + %{buildroot}/%{python2_sitelib}/pywbem/twisted_client.py +install -m644 LICENSE.txt \ + %{buildroot}/%{python2_sitelib}/pywbem/LICENSE.txt pushd %{py3_build_dir} -env PYTHONPATH=%{buildroot}/%{python3_sitelib} %{__python3} setup.py install -O1 --skip-build --root %{buildroot} +env PYTHONPATH=%{buildroot}/%{python3_sitelib} \ + PBR_VERSION="%{version}" \ + %{__python3} setup.py install -O1 --skip-build --root %{buildroot} +install -m644 LICENSE.txt \ + %{buildroot}/%{python3_sitelib}/pywbem/LICENSE.txt rm -rf %{buildroot}/usr/bin/*.bat popd %files -n python2-pywbem %{python2_sitelib}/*.egg-info %{python2_sitelib}/pywbem/ -%{python2_sitelib}/pywbem/LICENSE.txt +%{python2_sitelib}/pywbem_mock/ %files -n python3-pywbem %{python3_sitelib}/*.egg-info %{python3_sitelib}/pywbem/ -%{python3_sitelib}/pywbem/LICENSE.txt -%{python3_sitelib}/pywbem/__pycache__/ +%{python3_sitelib}/pywbem_mock/ %{_bindir}/mof_compiler %{_bindir}/wbemcli %{_bindir}/wbemcli.py @@ -109,6 +113,9 @@ popd %{python_sitelib}/pywbem/twisted_client.py* %changelog +* Fri May 04 2018 Gris Ge - 0.12.2-1 +- Upgrade to 0.12.2. + * Wed Feb 14 2018 Iryna Shcherbina - 0.11.0-6 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/sources b/sources index cdf0022..72f1b68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v0.11.0.tar.gz) = 9c71dc24dbe34a6f8c9e54fa8c0141b58a2fefea6cf3d9c1e96ddf0687068fda99059c7a08b257b06e9210f9c2f6eafdc5a9894bdfd91b03f147acff5f8d5925 +SHA512 (0.12.2.tar.gz) = 9b8a812bdc1b725a6c75012668213f14989b835f60d1e7372a60ed6f9a964e47b04bd7f42cb9a02b0e494488f7f7180b355ce3942fef60015b5733c364183e44