diff --git a/os-brick-4.0.1.tar.gz b/os-brick-4.0.1.tar.gz deleted file mode 100644 index f1b8d92..0000000 Binary files a/os-brick-4.0.1.tar.gz and /dev/null differ diff --git a/os-brick-4.3.1.tar.gz b/os-brick-4.3.1.tar.gz new file mode 100644 index 0000000..19939d0 Binary files /dev/null and b/os-brick-4.3.1.tar.gz differ diff --git a/python-os-brick.spec b/python-os-brick.spec index de04a20..18c1421 100644 --- a/python-os-brick.spec +++ b/python-os-brick.spec @@ -1,119 +1,115 @@ -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -%global with_doc 1 - +%global _empty_manifest_terminate_build 0 Name: python-os-brick -Version: 4.0.1 -Release: 3 +Version: 4.3.1 +Release: 1 Summary: OpenStack Cinder brick library for managing local volume attaches License: Apache-2.0 -URL: https://opendev.org/openstack/os-brick -Source0: https://tarballs.openstack.org/os-brick/os-brick-4.0.1.tar.gz +URL: https://docs.openstack.org/os-brick/ +Source0: https://files.pythonhosted.org/packages/46/69/4a7d64a184c63f7e5f99eebf33d31141521e664558e7212cecf617070112/os-brick-4.3.1.tar.gz BuildArch: noarch - - %description Volume discovery and local storage management lib %package -n python3-os-brick Summary: OpenStack Cinder brick library for managing local volume attaches -%{?python_provide:%python_provide python3-os-brick} -Provides: os-brick = %{version}-%{release} - -Requires: python3-pbr -Requires: python3-eventlet >= 0.25.1 -Requires: python3-oslo-concurrency >= 3.26.0 -Requires: python3-oslo-context >= 2.23.0 -Requires: python3-oslo-i18n >= 3.24.0 -Requires: python3-oslo-log >= 3.44.0 -Requires: python3-oslo-serialization >= 2.29.0 -Requires: python3-oslo-service >= 1.24.0 -Requires: python3-oslo-utils >= 3.34.0 -Requires: python3-requests >= 2.14.2 -Requires: python3-six >= 1.10.0 -Requires: python3-oslo-privsep >= 1.32.0 -Requires: python3-os-win >= 3.0.0 -Requires: cryptsetup -Requires: device-mapper-multipath -Requires: iscsi-initiator-utils -Requires: lsscsi >= 0.29 -Requires: lvm2 -Requires: nfs-utils -Requires: sg3_utils -Requires: sysfsutils - -Requires: python3-tenacity - -BuildRequires: openstack-macros +Provides: python-os-brick +# Base build requires BuildRequires: python3-devel -BuildRequires: python3-ddt -BuildRequires: python3-pbr >= 2.0.0 -BuildRequires: python3-pip -BuildRequires: python3-reno -BuildRequires: python3-oslo-concurrency >= 3.8.0 -BuildRequires: python3-oslo-i18n >= 3.15.3 -BuildRequires: python3-oslo-log >= 3.36.0 -BuildRequires: python3-oslo-service >= 1.24.0 -BuildRequires: python3-os-win -BuildRequires: python3-requests >= 2.14.2 -BuildRequires: python3-six >= 1.10.0 BuildRequires: python3-setuptools -BuildRequires: python3-oslo-privsep >= 1.32.0 -BuildRequires: python3-oslo-vmware -BuildRequires: python3-testtools - -# Castellan is only for unit tests -BuildRequires: python3-castellan - -%if 0%{?with_doc} -BuildRequires: python3-openstackdocstheme -BuildRequires: python3-sphinx -%endif - +BuildRequires: python3-pbr +BuildRequires: python3-pip +BuildRequires: python3-wheel +# General requires +BuildRequires: python3-eventlet +BuildRequires: python3-os-win +BuildRequires: python3-oslo-concurrency +BuildRequires: python3-oslo-context +BuildRequires: python3-oslo-i18n +BuildRequires: python3-oslo-log +BuildRequires: python3-oslo-privsep +BuildRequires: python3-oslo-serialization +BuildRequires: python3-oslo-service +BuildRequires: python3-oslo-utils +BuildRequires: python3-requests BuildRequires: python3-tenacity +BuildRequires: python3-os-win +# General requires +Requires: python3-eventlet +Requires: python3-os-win +Requires: python3-oslo-concurrency +Requires: python3-oslo-context +Requires: python3-oslo-i18n +Requires: python3-oslo-log +Requires: python3-oslo-privsep +Requires: python3-oslo-serialization +Requires: python3-oslo-service +Requires: python3-oslo-utils +Requires: python3-pbr +Requires: python3-requests +Requires: python3-tenacity %description -n python3-os-brick Volume discovery and local storage management lib +%package help +Summary: OpenStack Cinder brick library for managing local volume attaches +Provides: python3-os-brick-doc +%description help +Volume discovery and local storage management lib + %prep - -%autosetup -n os-brick-4.0.1 -p1 -%py_req_cleanup - +%autosetup -n os-brick-4.3.1 %build -%{py3_build} - -%check -python3 setup.py test +%py3_build %install -%{py3_install} - -%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 - +%py3_install # Move config files to proper location install -d -m 755 %{buildroot}%{_datarootdir}/os-brick/rootwrap mv %{buildroot}/usr/etc/os-brick/rootwrap.d/*.filters %{buildroot}%{_datarootdir}/os-brick/rootwrap -%files -n python3-os-brick -%license LICENSE -%if 0%{?with_doc} -%doc doc/build/html -%endif -%doc README.rst -%{python3_sitelib}/os_brick* +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 . + +# pycodestyle version doesn't satisfy the requirement, skip now +#%check +#%{__python3} setup.py test + +%files -n python3-os-brick -f filelist.lst +%dir %{python3_sitelib}/* %{_datarootdir}/os-brick -%exclude %{python3_sitelib}/os_brick/tests + +%files help -f doclist.lst +%{_docdir}/* %changelog +* Mon Aug 09 2021 OpenStack_SIG - 4.3.1-1 +- Upgrade version * Fri Jul 30 2021 chenyanpanHW - 4.0.1-3 - DESC: delete -S git from %autosetup, and delete BuildRequires git - * Tue Jan 12 2021 zhangy 2021.1.12 - Update to 2021.1.12