diff --git a/oslo.vmware-2.34.1.tar.gz b/oslo.vmware-2.34.1.tar.gz new file mode 100644 index 0000000..588f959 Binary files /dev/null and b/oslo.vmware-2.34.1.tar.gz differ diff --git a/oslo.vmware-3.8.0.tar.gz b/oslo.vmware-3.8.0.tar.gz deleted file mode 100644 index d3602a8..0000000 Binary files a/oslo.vmware-3.8.0.tar.gz and /dev/null differ diff --git a/python-oslo-vmware.spec b/python-oslo-vmware.spec index 94b84a6..764a16b 100644 --- a/python-oslo-vmware.spec +++ b/python-oslo-vmware.spec @@ -1,176 +1,104 @@ -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} -%global with_doc 1 - +%global _empty_manifest_terminate_build 0 Name: python-oslo-vmware -Version: 3.8.0 -Release: 5 -Summary: Oslo VMware library for OpenStack projects -License: ASL 2.0 -URL: https://opendev.org/openstack/oslo.vmware -Source0: https://tarballs.openstack.org/oslo.vmware/oslo.vmware-3.8.0.tar.gz +Version: 2.34.1 +Release: 1 +Summary: Oslo VMware library +License: Apache-2.0 +URL: https://docs.openstack.org/oslo.vmware/latest/ +Source0: https://files.pythonhosted.org/packages/b2/db/de7f26b6d466d3bec50a68e824e5d8f5fe1dafd3211aba2797ce3ead8521/oslo.vmware-2.34.1.tar.gz BuildArch: noarch - %description Oslo VMware library for OpenStack projects %package -n python3-oslo-vmware -Summary: Oslo VMware library for OpenStack projects -%{?python_provide:%python_provide python3-oslo-vmware} - +Summary: Oslo VMware library +Provides: python-oslo-vmware +# Base build requires BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: python3-pbr BuildRequires: python3-pip -BuildRequires: git -# test dependencies -BuildRequires: python3-ddt -BuildRequires: python3-fixtures -BuildRequires: python3-mock -BuildRequires: python3-stestr -BuildRequires: python3-subunit -BuildRequires: python3-testtools -BuildRequires: python3-suds-jurko -BuildRequires: python3-oslo-concurrency -BuildRequires: python3-oslo-context -BuildRequires: python3-oslo-utils -BuildRequires: python3-oslo-i18n -BuildRequires: python3-eventlet -BuildRequires: python3-oslo-i18n -BuildRequires: python3-oslo-utils -BuildRequires: python3-requests >= 2.14.2 -BuildRequires: python3-suds-jurko -BuildRequires: python3-netaddr -# Required to compile translation files -BuildRequires: python3-testscenarios -BuildRequires: python3-babel - -BuildRequires: python3-lxml - -Requires: python3-pbr -Requires: python3-eventlet -Requires: python3-oslo-concurrency >= 3.26.0 -Requires: python3-oslo-context >= 2.19.2 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-utils -Requires: python3-requests -Requires: python3-stevedore >= 1.20.0 -Requires: python3-suds-jurko -Requires: python3-urllib3 -Requires: python3-netaddr -Requires: python-oslo-vmware-lang = %{version}-%{release} - -Requires: python3-lxml -Requires: python3-PyYAML - +BuildRequires: python3-wheel +# General requires +BuildRequires: python3-stevedore +BuildRequires: python3-netaddr +BuildRequires: python3-six +BuildRequires: python3-oslo-i18n +BuildRequires: python3-oslo-utils +BuildRequires: python3-pyyaml +BuildRequires: python3-lxml +BuildRequires: python3-suds-jurko +BuildRequires: python3-eventlet +BuildRequires: python3-requests +BuildRequires: python3-urllib3 +BuildRequires: python3-oslo-concurrency +BuildRequires: python3-oslo-context +# General requires +Requires: python3-pbr +Requires: python3-stevedore +Requires: python3-netaddr +Requires: python3-six +Requires: python3-oslo-i18n +Requires: python3-oslo-utils +Requires: python3-pyyaml +Requires: python3-lxml +Requires: python3-suds-jurko +Requires: python3-eventlet +Requires: python3-requests +Requires: python3-urllib3 +Requires: python3-oslo-concurrency +Requires: python3-oslo-context %description -n python3-oslo-vmware Oslo VMware library for OpenStack projects -%if 0%{?with_doc} -%package -n python-oslo-vmware-doc -Summary: Documentation for OpenStack common VMware library - -BuildRequires: python3-sphinx -BuildRequires: python3-sphinxcontrib-apidoc -BuildRequires: python3-openstackdocstheme - -%description -n python-oslo-vmware-doc -Documentation for OpenStack common VMware library. -%endif - -%package -n python3-oslo-vmware-tests -Summary: Test subpackage for OpenStack common VMware library - -Requires: python3-oslo-vmware = %{version}-%{release} -Requires: python3-fixtures -Requires: python3-mock -Requires: python3-subunit -Requires: python3-testtools -Requires: python3-suds-jurko -Requires: python3-oslo-context -Requires: python3-oslo-utils -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-testscenarios - -%description -n python3-oslo-vmware-tests -Tests for OpenStack common VMware library. - -%package -n python-oslo-vmware-lang -Summary: Translation files for Oslo vmware library - -%description -n python-oslo-vmware-lang -Translation files for Oslo vmware library +%package help +Summary: Oslo VMware library +Provides: python3-oslo-vmware-doc +%description help +Oslo VMware library for OpenStack projects %prep - -%autosetup -n oslo.vmware-3.8.0 -# FIXME(hguemar): requirements blocks 0.20.1 due to lp#1696094 -# but eventlet 0.20.1-2 package has backported the fix -sed -i '/eventlet/s/!=0.20.1,//' requirements.txt -# FIXME(hguemar): we use system lxml from EL7 -sed -i '/lxml/s/,>=3.4.1//' requirements.txt +%autosetup -n oslo.vmware-%{version} %build -%{py3_build} - -%if 0%{?with_doc} -# generate html docs -sphinx-build-3 -b html doc/source doc/build/html - -# remove the sphinx-build-3 leftovers -rm -rf doc/build/html/.{doctrees,buildinfo} -%endif - -# Generate i18n files -python3 setup.py compile_catalog -d build/lib/oslo_vmware/locale --domain oslo_vmware +%py3_build %install -%{py3_install} +%py3_install -# Install i18n .mo files (.po and .pot are not required) -install -d -m 755 %{buildroot}%{_datadir} -rm -f %{buildroot}%{python3_sitelib}/oslo_vmware/locale/*/LC_*/oslo_vmware*po -rm -f %{buildroot}%{python3_sitelib}/oslo_vmware/locale/*pot -mv %{buildroot}%{python3_sitelib}/oslo_vmware/locale %{buildroot}%{_datadir}/locale +install -d -m755 %{buildroot}/%{_pkgdocdir} +if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi +if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi +if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi +if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi +pushd %{buildroot} +if [ -d usr/lib ]; then + find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/lib64 ]; then + find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/bin ]; then + find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/sbin ]; then + find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst +fi +touch doclist.lst +if [ -d usr/share/man ]; then + find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst +fi +popd +mv %{buildroot}/filelist.lst . +mv %{buildroot}/doclist.lst . -# Find language files -%find_lang oslo_vmware --all-name +%files -n python3-oslo-vmware -f filelist.lst +%dir %{python3_sitelib}/* -%check -rm -f ./oslo_vmware/tests/test_hacking.py -export OS_TEST_PATH="./oslo_vmware/tests" -PYTHON=python3 stestr-3 --test-path $OS_TEST_PATH run - -%files -n python3-oslo-vmware -%doc README.rst -%license LICENSE -%{python3_sitelib}/oslo_vmware -%{python3_sitelib}/*.egg-info -%exclude %{python3_sitelib}/oslo_vmware/tests - -%if 0%{?with_doc} -%files -n python-oslo-vmware-doc -%doc doc/build/html -%license LICENSE -%endif - -%files -n python3-oslo-vmware-tests -%{python3_sitelib}/oslo_vmware/tests - -%files -n python-oslo-vmware-lang -f oslo_vmware.lang -%license LICENSE +%files help -f doclist.lst +%{_docdir}/* %changelog -* Tue Aug 17 2021 liusheng - 3.8.0-5 -- Replace python3-suds with python3-suds-jurko requires - -* Fri Aug 13 2021 joec88 -- Update to 3.8.0 - -* Mon Jan 25 2021 zhangy1317 -- Add BuildRequires python3-pip - -* Wed Oct 21 2020 Joel Capitao 3.7.0-2 -- Enable sources tarball validation using GPG signature. - -* Fri Sep 18 2020 RDO 3.7.0-1 -- Update to 3.7.0 +* Mon Nov 15 2021 OpenStack_SIG - 2.34.1-1 +- Init package python3-oslo-vmware of version 2.34.1