Accepting request 898853 from home:lee_duncan:branches:Base:System

- Update to version 2.1.54:
  * version 2.1.54
  * fileio backstore: fix sparse file creation
  * Do not install systemd files in setup.py
  Removing the need for our patch fix-setup-install.patch,
  since that managed systemd file locations, now handled
  in the SPEC file. Also, fixed incorrect spelling of
  targetclid as targetcld for preun stop_on_removal.

OBS-URL: https://build.opensuse.org/request/show/898853
OBS-URL: https://build.opensuse.org/package/show/Base:System/targetcli-fb?expand=0&rev=49

_service

@@ -7,7 +7,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(\d*\.\d*\.)(\d*)</param>
     <param name="versionrewrite-replacement">\1\2</param>
-    <param name="revision">v2.1.53</param>
+    <param name="revision">v2.1.54</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="recompress" mode="disabled">

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/open-iscsi/targetcli-fb.git</param>
-              <param name="changesrevision">ff7766b737c0868ae2579da49f2e8304f40767ee</param></service></servicedata>
+              <param name="changesrevision">033cf1c2d34c73cce84c4c12c7383188167bf9e5</param></service></servicedata>

fix-setup-install.patch

@@ -1,20 +0,0 @@
-From: Lee Duncan <lduncan@suse.com>
-Date: Thu May 21 11:32:02 PDT 2020
-Subject: [PATCH] fix setup install patch
-
-Fix the setup.py install script to install systemd
-files in /usr/lib/systemd/system instead of /lib/systemd/system
----
-diff --git a/setup.py b/setup.py
-index 4518165c57a6..2ebfc04605c0 100755
---- a/setup.py
-+++ b/setup.py
-@@ -34,7 +34,7 @@ setup(
-                'scripts/targetcli',
-                'daemon/targetclid'
-               ],
--    data_files = [('/lib/systemd/system', ['systemd/targetclid.socket', 'systemd/targetclid.service'])],
-+    data_files = [('/usr/lib/systemd/system', ['systemd/targetclid.socket', 'systemd/targetclid.service'])],
-     classifiers = [
-         "Programming Language :: Python",
-         "Programming Language :: Python :: 3",

targetcli-fb-2.1.53.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09b2e5640d9316c612f0a5ba055c4ace4a3051685c8a38eee9366ef9adceb81c
-size 34212

targetcli-fb-2.1.54.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fa7bfc19ba948b0122888330e7c411c0cfe7990f6db2aca5b9f403c03e6220d
+size 34184

targetcli-fb.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jun 09 15:47:58 UTC 2021 - lduncan@suse.com
+
+- Update to version 2.1.54:
+  * version 2.1.54
+  * fileio backstore: fix sparse file creation
+  * Do not install systemd files in setup.py
+  Removing the need for our patch fix-setup-install.patch,
+  since that managed systemd file locations, now handled
+  in the SPEC file. Also, fixed incorrect spelling of
+  targetclid as targetcld for preun stop_on_removal.
+
 -------------------------------------------------------------------
 Sun Jan 24 22:48:23 UTC 2021 - Lee Duncan <lduncan@suse.com>
 

targetcli-fb.spec

@@ -18,7 +18,7 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           targetcli-fb
-Version:        2.1.53
+Version:        2.1.54
 Release:        0
 Summary:        A command shell for managing the Linux LIO kernel target
 License:        Apache-2.0
@@ -59,7 +59,6 @@ Obsoletes:      targetcli-rbd < %{version}
 # SUSE-specific patches
 Patch1:         Split-out-blockdev-readonly-state-detection-helper.patch
 Patch2:         rbd-support.patch
-Patch3:         fix-setup-install.patch
 
 %python_subpackages
 
@@ -89,7 +88,6 @@ all python-version-dependant packages, such as python3-*-targetcli-fb.
 # RBD support is dependent on LIO changes present in the SLE/Leap kernel
 %patch2 -p1
 %endif
-%patch3 -p1
 
 %build
 %python_build
@@ -104,6 +102,8 @@ install -d -m755 %{buildroot}%{_sbindir}
 install -D -m644 targetcli.8 %{buildroot}%{_mandir}/man8/targetcli.8
 install -D -m644 targetclid.8 %{buildroot}%{_mandir}/man8/targetclid.8
 install -D -m644 %{S:1} %{buildroot}%{_unitdir}/targetcli.service
+install -D -m644 systemd/targetclid.service %{buildroot}%{_unitdir}/targetclid.service
+install -D -m644 systemd/targetclid.socket %{buildroot}%{_unitdir}/targetclid.socket
 %fdupes %{buildroot}
 ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rctargetcli
 ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rctargetclid
@@ -120,7 +120,7 @@ ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rctargetclid
 %{service_add_pre targetcli.service targetclid.socket targetclid.service}
 
 %preun
-%{stop_on_removal targetcld targetcli}
+%{stop_on_removal targetclid targetcli}
 %{service_del_preun targetcli.service targetclid.socket targetclid.service}
 
 %post -n %{name}-common