diff --git a/osc-lib-2.2.1.tar.gz b/osc-lib-2.2.1.tar.gz deleted file mode 100644 index 40573a3..0000000 Binary files a/osc-lib-2.2.1.tar.gz and /dev/null differ diff --git a/osc-lib-2.3.1.tar.gz b/osc-lib-2.3.1.tar.gz new file mode 100644 index 0000000..888ceef Binary files /dev/null and b/osc-lib-2.3.1.tar.gz differ diff --git a/python-osc-lib.spec b/python-osc-lib.spec index df1b21f..9547129 100644 --- a/python-osc-lib.spec +++ b/python-osc-lib.spec @@ -1,123 +1,108 @@ %global _empty_manifest_terminate_build 0 -%global with_doc 1 - -Name: python-osc-lib -Version: 2.2.1 -Release: 4 -Summary: OpenStack library for writing OSC plugins -License: Apache-2.0 -URL: https://github.com/openstack/osc-lib/ -Source0: https://tarballs.openstack.org/osc-lib/osc-lib-2.2.1.tar.gz -BuildArch: noarch - +Name: python-osc-lib +Version: 2.3.1 +Release: 1 +Summary: OpenStackClient Library +License: Apache-2.0 +URL: https://docs.openstack.org/osc-lib/latest/ +Source0: https://files.pythonhosted.org/packages/f4/70/a92bb13b8eaf13be71e72d5137c338279eb139dddc8b146b9849f5e20259/osc-lib-2.3.1.tar.gz +BuildArch: noarch +%description +OpenStackClient Library %package -n python3-osc-lib -Summary: OpenStack library for writing OSC plugins -%{?python_provide:%python_provide python3-osc-lib} - -BuildRequires: openstack-macros +Summary: OpenStackClient Library +Provides: python-osc-lib +# Base build requires BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: python3-pbr BuildRequires: python3-pip -BuildRequires: python3-setuptools -BuildRequires: python3-oslo-i18n -BuildRequires: python3-keystoneauth1 -BuildRequires: python3-mock -BuildRequires: python3-fixtures -BuildRequires: python3-stestr -BuildRequires: python3-testtools -BuildRequires: python3-oslo-utils -BuildRequires: python3-os-client-config -BuildRequires: python3-openstacksdk -BuildRequires: python3-requests -BuildRequires: python3-stevedore +BuildRequires: python3-wheel +# General requires BuildRequires: python3-cliff -BuildRequires: python3-requests-mock +BuildRequires: python3-keystoneauth1 +BuildRequires: python3-openstacksdk +BuildRequires: python3-oslo-i18n +BuildRequires: python3-oslo-utils BuildRequires: python3-simplejson - -Requires: python3-pbr >= 2.0.0 -Requires: python3-keystoneauth1 >= 3.14.0 -Requires: python3-openstacksdk >= 0.15.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-stevedore >= 1.20.0 -Requires: python3-cliff >= 3.2.0 -Requires: python3-simplejson >= 3.5.1 - +BuildRequires: python3-stevedore +#BuildRequires: python3-testtools +#BuildRequires: python3-stestr +#BuildRequires: python3-osprofiler +#BuildRequires: python3-testrepository +#BuildRequires: python3-coverage +#BuildRequires: python3-fixtures +#BuildRequires: python3-oslotest +#BuildRequires: python3-requests-mock +# General requires +Requires: python3-cliff +Requires: python3-keystoneauth1 +Requires: python3-openstacksdk +Requires: python3-oslo-i18n +Requires: python3-oslo-utils +Requires: python3-pbr +Requires: python3-simplejson +Requires: python3-stevedore %description -n python3-osc-lib -osc-lib is a package of common support modules for writing OSC plugins. - -%package -n python3-osc-lib-tests -Summary: OpenStack osc-lib library tests -%{?python_provide:%python_provide python3-osc-lib-tests} - -Requires: python3-osc-lib = %{version}-%{release} -Requires: python3-fixtures -Requires: python3-mock -Requires: python3-stestr -Requires: python3-testtools -Requires: python3-requests-mock - -%description -n python3-osc-lib-tests -osc-lib is a package of common support modules for writing OSC plugins. - -This package contains the osc-lib library test files. - -%if 0%{?with_doc} -%package -n python-osc-lib-doc -Summary: OpenStack osc-lib library documentation - -BuildRequires: python3-sphinx -BuildRequires: python3-openstackdocstheme -BuildRequires: python3-sphinxcontrib-apidoc - -%description -n python-osc-lib-doc - -This package contains the documentation. -%endif - -%description -osc-lib is a package of common support modules for writing OSC plugins. +OpenStackClient Library +%package help +Summary: OpenStackClient Library +Provides: python3-osc-lib-doc +%description help +OpenStackClient Library %prep -%autosetup -n osc-lib-2.2.1 -p1 -rm -f *requirements.txt +%autosetup -n osc-lib-%{version} %build -%{py3_build} - -%if 0%{?with_doc} -export PYTHONPATH=. -sphinx-build-3 -b html doc/source doc/build/html -rm -rf doc/build/html/.{doctrees,buildinfo} -%endif +%py3_build %install -%{py3_install} +%py3_install -%check -PYTHON=%{__python3} stestr run +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 . -%files -n python3-osc-lib -%license LICENSE -%{python3_sitelib}/osc_lib -%{python3_sitelib}/osc_lib-*.egg-info -%exclude %{python3_sitelib}/osc_lib/tests +#%check +#%{__python3} setup.py test -%files -n python3-osc-lib-tests -%license LICENSE -%{python3_sitelib}/osc_lib/tests +%files -n python3-osc-lib -f filelist.lst -%if 0%{?with_doc} -%files -n python-osc-lib-doc -%license LICENSE -%doc doc/build/html README.rst -%endif +%dir %{python3_sitelib}/* + +%files help -f doclist.lst +%{_docdir}/* %changelog +* Thu Aug 05 2021 OpenStack_SIG - 2.3.1-1 +- Upgrade version * Fri Jul 30 2021 chenyanpanHW - 2.2.1-4 - DESC: delete -S git from %autosetup, and delete BuildRequires git - * Thu Jan 26 2021 Python_Bot - Package Spec generated +