diff --git a/0001-Drop-windows-connection.patch b/0001-Drop-windows-connection.patch new file mode 100644 index 0000000000000000000000000000000000000000..5700b814af566b4c16a265c520e99a2fae4100e9 --- /dev/null +++ b/0001-Drop-windows-connection.patch @@ -0,0 +1,31 @@ +From 8b8eaad8255fedcd60188f86552ad2bd3078b416 Mon Sep 17 00:00:00 2001 +From: wangxiyuan +Date: Mon, 7 Jun 2021 07:38:43 +0000 +Subject: [PATCH] Drop windows connection + +--- + os_brick/initiator/connector.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/os_brick/initiator/connector.py b/os_brick/initiator/connector.py +index f444b2f..4ed0194 100644 +--- a/os_brick/initiator/connector.py ++++ b/os_brick/initiator/connector.py +@@ -58,10 +58,10 @@ connector_list = [ + 'os_brick.initiator.connectors.scaleio.ScaleIOConnector', + 'os_brick.initiator.connectors.disco.DISCOConnector', + 'os_brick.initiator.connectors.vmware.VmdkConnector', +- 'os_brick.initiator.windows.base.BaseWindowsConnector', +- 'os_brick.initiator.windows.iscsi.WindowsISCSIConnector', +- 'os_brick.initiator.windows.fibre_channel.WindowsFCConnector', +- 'os_brick.initiator.windows.smbfs.WindowsSMBFSConnector', ++# 'os_brick.initiator.windows.base.BaseWindowsConnector', ++# 'os_brick.initiator.windows.iscsi.WindowsISCSIConnector', ++# 'os_brick.initiator.windows.fibre_channel.WindowsFCConnector', ++# 'os_brick.initiator.windows.smbfs.WindowsSMBFSConnector', + 'os_brick.initiator.connectors.vrtshyperscale.HyperScaleConnector', + 'os_brick.initiator.connectors.storpool.StorPoolConnector', + 'os_brick.initiator.connectors.nvme.NVMeConnector', +-- +2.27.0 + diff --git a/os-brick-2.3.1.tar.gz b/os-brick-2.3.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f4b18f92afeeda691afbb6e42148b5b306d3146f Binary files /dev/null and b/os-brick-2.3.1.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..779c5a778c825d17ea5c60e61fdf8e2655a05902 100644 --- a/python-os-brick.spec +++ b/python-os-brick.spec @@ -1,117 +1,101 @@ -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -%global with_doc 1 - -Name: python-os-brick -Version: 4.0.1 -Release: 2 -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 -BuildArch: noarch - - +%global _empty_manifest_terminate_build 0 +%global __requires_exclude os-win|eventlet +Name: python-os-brick +Version: 2.3.1 +Release: 5 +Summary: OpenStack Cinder brick library for managing local volume attaches +License: Apache-2.0 +URL: https://docs.openstack.org/os-brick/ +Source0: https://files.pythonhosted.org/packages/64/20/619cfaad181f53abf5650147c5203d534824bab3641543228b369892242a/os-brick-2.3.1.tar.gz +Patch0000: 0001-Drop-windows-connection.patch +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 -BuildRequires: python3-devel -BuildRequires: python3-ddt -BuildRequires: python3-pbr >= 2.0.0 -BuildRequires: python3-pip -BuildRequires: git -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-tenacity - -%description -n python3-os-brick -Volume discovery and local storage management lib + Team and repository tags .. Change things from this point on OpenStack Cinder +brick library for managing local volume attaches--Discovery of volumes being +attached to a host for many transport protocols. + +%package -n python2-os-brick +Summary: OpenStack Cinder brick library for managing local volume attaches +Provides: python2-os-brick +BuildRequires: python2-pbr +BuildRequires: python2-devel +BuildRequires: python2-setuptools +Requires: python2-pbr +Requires: python2-babel +Requires: python2-eventlet +Requires: python2-oslo-concurrency +Requires: python2-oslo-log +Requires: python2-oslo-i18n +Requires: python2-oslo-privsep +Requires: python2-oslo-service +Requires: python2-oslo-utils +Requires: python2-requests +Requires: python2-retrying +Requires: python2-six +%description -n python2-os-brick + Team and repository tags .. Change things from this point on OpenStack Cinder +brick library for managing local volume attaches--Discovery of volumes being +attached to a host for many transport protocols. + +%package help +Summary: Development documents and examples for os-brick +Provides: python2-os-brick-doc +%description help + Team and repository tags .. Change things from this point on OpenStack Cinder +brick library for managing local volume attaches--Discovery of volumes being +attached to a host for many transport protocols. %prep - -%autosetup -n os-brick-4.0.1 -S git -%py_req_cleanup - +%autosetup -n os-brick-2.3.1 -S git %build -%{py3_build} - -%check -python3 setup.py test +%py2_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 - -# 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* -%{_datarootdir}/os-brick -%exclude %{python3_sitelib}/os_brick/tests +%py2_install +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/etc ]; then + find usr/etc -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 python2-os-brick -f filelist.lst +%dir %{python2_sitelib}/* + +%files help -f doclist.lst +%{_docdir}/* %changelog -* Tue Jan 12 2021 zhangy 2021.1.12 -- Update to 2021.1.12 +* Mon Jun 07 2021 wangxiyuan +- Drop windows support +* Mon Jun 07 2021 zhangfan +- Drop eventlet version limit +* Fri Jun 04 2021 wangxiyuan +- Drop os-win require and correct babel require name +* Sat May 29 2021 huangtianhua +- Package Spec generated +* Wed May 12 2021 OpenStack_SIG +- Package Spec generated