diff --git a/os-brick-2.5.9.tar.gz b/os-brick-2.5.9.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9e5988d514e00ba92b7aaedfe85447212708d708 Binary files /dev/null and b/os-brick-2.5.9.tar.gz differ diff --git a/os-brick-4.0.1.tar.gz b/os-brick-4.0.1.tar.gz deleted file mode 100644 index f1b8d9252292ffa23ad026115eff682e6e12ef99..0000000000000000000000000000000000000000 Binary files a/os-brick-4.0.1.tar.gz and /dev/null differ diff --git a/python-os-brick.spec b/python-os-brick.spec index 96afc5379dad3bf49d056fc21ae55a650885544d..9073342f4126a1b4698f0ae24bd4c3098399f068 100644 --- a/python-os-brick.spec +++ b/python-os-brick.spec @@ -1,117 +1,152 @@ %{!?upstream_version: %global upstream_version %{version}%{?milestone}} +# There are some missing deps +%global with_python3 0 -%global with_doc 1 +%global pypi_name os-brick -Name: python-os-brick -Version: 4.0.1 -Release: 2 +%global common_desc \ +OpenStack Cinder brick library for managing local volume attaches + +Name: python-%{pypi_name} +Version: 2.5.9 +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: http://www.openstack.org/ +Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch - %description -Volume discovery and local storage management lib +%{common_desc} -%package -n python3-os-brick +%package -n python2-%{pypi_name} Summary: OpenStack Cinder brick library for managing local volume attaches -%{?python_provide:%python_provide python3-os-brick} +%{?python_provide:%python_provide python2-%{pypi_name}} Provides: os-brick = %{version}-%{release} +Requires: python2-pbr +Requires: python2-babel >= 2.3.4 +Requires: python2-eventlet >= 0.18.2 +Requires: python2-oslo-concurrency >= 3.26.0 +Requires: python2-oslo-i18n >= 3.15.3 +Requires: python2-oslo-log >= 3.36.0 +Requires: python2-oslo-service >= 1.24.0 +Requires: python2-oslo-utils >= 3.33.0 +Requires: python2-requests >= 2.14.2 +Requires: python2-six >= 1.10.0 +Requires: python2-oslo-privsep >= 1.23.0 +Requires: python2-os-win >= 3.0.0 +Requires: python2-retrying +Requires: device-mapper-multipath +Requires: sg3_utils +Requires: sysfsutils + +BuildRequires: python2-devel +BuildRequires: python2-ddt +BuildRequires: python2-pbr >= 2.0.0 +BuildRequires: git +BuildRequires: python2-reno +BuildRequires: python2-sphinx +BuildRequires: python2-oslo-concurrency >= 3.8.0 +BuildRequires: python2-oslo-i18n >= 3.15.3 +BuildRequires: python2-oslo-log >= 3.36.0 +BuildRequires: python2-oslo-service >= 1.24.0 +BuildRequires: python2-openstackdocstheme +BuildRequires: python2-os-win +BuildRequires: python2-requests >= 2.14.2 +BuildRequires: python2-six >= 1.10.0 +BuildRequires: python2-setuptools +BuildRequires: python2-oslo-privsep >= 1.23.0 +BuildRequires: python2-retrying + +%description -n python2-%{pypi_name} +%{common_desc} + +%if 0%{?with_python3} +%package -n python3-%{pypi_name} +Summary: OpenStack Cinder brick library for managing local volume attaches +%{?python_provide:%python_provide python3-%{pypi_name}} + Requires: python3-pbr -Requires: python3-eventlet >= 0.25.1 +Requires: python3-babel >= 2.3.4 +Requires: python3-eventlet >= 0.18.2 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-i18n >= 3.15.3 +Requires: python3-oslo-log >= 3.36.0 Requires: python3-oslo-service >= 1.24.0 -Requires: python3-oslo-utils >= 3.34.0 +Requires: python3-oslo-utils >= 3.33.0 Requires: python3-requests >= 2.14.2 +Requires: python3-retrying Requires: python3-six >= 1.10.0 -Requires: python3-oslo-privsep >= 1.32.0 -Requires: python3-os-win >= 3.0.0 -Requires: cryptsetup +Requires: python3-oslo-privsep >= 1.23.0 +Requires: python3-os-win 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 BuildRequires: python3-devel BuildRequires: python3-ddt BuildRequires: python3-pbr >= 2.0.0 -BuildRequires: python3-pip -BuildRequires: git BuildRequires: python3-reno +BuildRequires: python3-sphinx 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-openstackdocstheme +BuildRequires: python3-retrying 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 +BuildRequires: python3-oslo-privsep >= 1.23.0 -# Castellan is only for unit tests -BuildRequires: python3-castellan +%description -n python3-%{pypi_name} +%{common_desc} -%if 0%{?with_doc} -BuildRequires: python3-openstackdocstheme -BuildRequires: python3-sphinx %endif -BuildRequires: python3-tenacity - -%description -n python3-os-brick -Volume discovery and local storage management lib - %prep - -%autosetup -n os-brick-4.0.1 -S git -%py_req_cleanup +%autosetup -n %{pypi_name}-%{upstream_version} -S git %build -%{py3_build} - -%check -python3 setup.py test +%py2_build +%if 0%{?with_python3} +%py3_build +%endif %install -%{py3_install} - -%if 0%{?with_doc} +%py2_install # generate html docs -sphinx-build-3 -b html doc/source doc/build/html -# remove the sphinx-build-3 leftovers +%{__python2} setup.py build_sphinx -b html +# remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} + +%if 0%{?with_python3} +%py3_install %endif # 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 +install -d -m 755 %{buildroot}%{_datarootdir}/%{pypi_name}/rootwrap +mv %{buildroot}/usr/etc/os-brick/rootwrap.d/*.filters %{buildroot}%{_datarootdir}/%{pypi_name}/rootwrap -%files -n python3-os-brick +%files -n python2-%{pypi_name} %license LICENSE -%if 0%{?with_doc} -%doc doc/build/html -%endif -%doc README.rst +%doc doc/build/html README.rst +%{python2_sitelib}/os_brick* +%{_datarootdir}/%{pypi_name} +%exclude %{python2_sitelib}/os_brick/tests + +%if 0%{?with_python3} +%files -n python3-%{pypi_name} +%license LICENSE +%doc doc/build/html README.rst %{python3_sitelib}/os_brick* -%{_datarootdir}/os-brick +%{_datarootdir}/%{pypi_name} %exclude %{python3_sitelib}/os_brick/tests +%endif %changelog -* Tue Jan 12 2021 zhangy 2021.1.12 -- Update to 2021.1.12 +* Mon May 10 2021 Python_Bot +- Package Spec generated