From 595face9e2d6e0d44bb81b35c83361394eb5719b964de916c1d93948ded3a0c2 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Tue, 3 Mar 2020 17:15:41 +0000 Subject: [PATCH] Accepting request 781293 from home:lee_duncan:branches:devel:languages:python - Update to version v2.1.71 (jre#SLE-9345) from v2.1.70: * version 2.1.71 * restoreconfig: fix skipping of targets [re]loading Replacing python-rtslib-fb-v2.1.70.tar.xz with python-rtslib-fb-v2.1.71.tar.xz OBS-URL: https://build.opensuse.org/request/show/781293 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-rtslib-fb?expand=0&rev=47 --- _service | 2 +- _servicedata | 2 +- python-rtslib-fb-v2.1.70.tar.xz | 3 --- python-rtslib-fb-v2.1.71.tar.xz | 3 +++ python-rtslib-fb.changes | 8 ++++++++ python-rtslib-fb.spec | 9 +++++---- rbd-support.patch | 17 +++++------------ 7 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 python-rtslib-fb-v2.1.70.tar.xz create mode 100644 python-rtslib-fb-v2.1.71.tar.xz diff --git a/_service b/_service index ddb5533..6728854 100644 --- a/_service +++ b/_service @@ -7,7 +7,7 @@ @PARENT_TAG@ v(\d*\.\d*\.)fb(\d*) \1\2 - v2.1.70 + v2.1.71 enable diff --git a/_servicedata b/_servicedata index 01f6e96..b765416 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/open-iscsi/rtslib-fb.git - 2b160b754d48d5dfdfe1d41089d4e9af24ba3b29 \ No newline at end of file + b37bc67fc7ed3d1ec447e9f43eb68d30dd716367 \ No newline at end of file diff --git a/python-rtslib-fb-v2.1.70.tar.xz b/python-rtslib-fb-v2.1.70.tar.xz deleted file mode 100644 index 537c7ff..0000000 --- a/python-rtslib-fb-v2.1.70.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24afadfbe39eb93d65b507fe4b398a91f8381f0191255fc0213dba00c31538e8 -size 42048 diff --git a/python-rtslib-fb-v2.1.71.tar.xz b/python-rtslib-fb-v2.1.71.tar.xz new file mode 100644 index 0000000..8ca33d5 --- /dev/null +++ b/python-rtslib-fb-v2.1.71.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63d65fc9af4aeb87372a3342e89d5cd78342a8637721c6c28d862abb148f9ce3 +size 42064 diff --git a/python-rtslib-fb.changes b/python-rtslib-fb.changes index 7902ad1..2153441 100644 --- a/python-rtslib-fb.changes +++ b/python-rtslib-fb.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 03 15:46:53 UTC 2020 - lduncan@suse.com + +- Update to version v2.1.71 (jre#SLE-9345): + * version 2.1.71 + * restoreconfig: fix skipping of targets [re]loading + Replacing python-rtslib-fb-v2.1.70.tar.xz with python-rtslib-fb-v2.1.71.tar.xz + ------------------------------------------------------------------- Mon Sep 16 18:14:18 UTC 2019 - lduncan@suse.com diff --git a/python-rtslib-fb.spec b/python-rtslib-fb.spec index b15aa09..e72d316 100644 --- a/python-rtslib-fb.spec +++ b/python-rtslib-fb.spec @@ -1,7 +1,7 @@ # # spec file for package python-rtslib-fb # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,12 @@ %define dbdir %{_sysconfdir}/target %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-rtslib-fb -Version: 2.1.70 +Version: 2.1.71 Release: 0%{?dist} Summary: API for Linux kernel SCSI target (aka LIO) License: Apache-2.0 Group: Development/Languages/Python -Url: https://github.com/open-iscsi/rtslib-fb.git +URL: https://github.com/open-iscsi/rtslib-fb.git Source: %{name}-v%{version}.tar.xz Patch1: rbd-support.patch BuildRequires: %{python_module pyudev} @@ -83,7 +83,8 @@ install -d -m755 %{buildroot}/%{dbdir}/alua %files %{python_files} %python_alternative %{_bindir}/targetctl %{python_sitelib}/* -%doc COPYING README.md +%license COPYING +%doc README.md %doc %python_alternative %{_mandir}/man5/saveconfig.json.5.gz %doc %python_alternative %{_mandir}/man8/targetctl.8.gz %dir %{dbdir} diff --git a/rbd-support.patch b/rbd-support.patch index ae2c2e4..10e2717 100644 --- a/rbd-support.patch +++ b/rbd-support.patch @@ -8,12 +8,10 @@ https://marc.info/?l=ceph-devel&m=143816209010058 Reviewed-by: David Disseldorp --- - rtslib/__init__.py | 1 + - rtslib/tcm.py | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + rtslib/__init__.py | 1 + rtslib/tcm.py | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) -diff --git a/rtslib/__init__.py b/rtslib/__init__.py -index 568619e..1a5bee5 100644 --- a/rtslib/__init__.py +++ b/rtslib/__init__.py @@ -32,6 +32,7 @@ from .fabric import FabricModule @@ -24,11 +22,9 @@ index 568619e..1a5bee5 100644 from .tcm import StorageObjectFactory from .alua import ALUATargetPortGroup -diff --git a/rtslib/tcm.py b/rtslib/tcm.py -index 1aeea23..17df8e9 100644 --- a/rtslib/tcm.py +++ b/rtslib/tcm.py -@@ -780,6 +780,107 @@ class BlockStorageObject(StorageObject): +@@ -801,6 +801,107 @@ class BlockStorageObject(StorageObject): d['dev'] = self.udev_path return d @@ -136,7 +132,7 @@ index 1aeea23..17df8e9 100644 class UserBackedStorageObject(StorageObject): ''' -@@ -897,6 +998,7 @@ so_mapping = { +@@ -940,6 +1041,7 @@ so_mapping = { "fileio": FileIOStorageObject, "iblock": BlockStorageObject, "block": BlockStorageObject, @@ -144,7 +140,7 @@ index 1aeea23..17df8e9 100644 "user": UserBackedStorageObject, } -@@ -907,6 +1009,7 @@ bs_params = { +@@ -950,6 +1052,7 @@ bs_params = { FileIOStorageObject: dict(name='fileio'), BlockStorageObject: dict(name='block', alt_dirprefix='iblock'), UserBackedStorageObject: dict(name='user'), @@ -152,6 +148,3 @@ index 1aeea23..17df8e9 100644 } bs_cache = {} --- -2.13.6 -