From 50e49a03b76186fc20cd4ac1aac4bbe263cc0550 Mon Sep 17 00:00:00 2001
From: Maurizio Lombardi <mlombard@redhat.com>
Date: Mon, 17 May 2021 11:07:25 +0200
Subject: [PATCH] Update to version 2.1.54

Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
---
 .gitignore                                    |  1 +
 ...ot-install-systemd-files-in-setup.py.patch | 26 -------------------
 sources                                       |  2 +-
 targetcli.spec                                |  9 ++++---
 4 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 Do-not-install-systemd-files-in-setup.py.patch

diff --git a/.gitignore b/.gitignore
index eadb92c..15e020b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@
 /targetcli-fb-2.1.fb48.tar.gz
 /targetcli-fb-2.1.fb49.tar.gz
 /targetcli-fb-2.1.53.tar.gz
+/targetcli-fb-2.1.54.tar.gz
diff --git a/Do-not-install-systemd-files-in-setup.py.patch b/Do-not-install-systemd-files-in-setup.py.patch
deleted file mode 100644
index 5bb02bc..0000000
--- a/Do-not-install-systemd-files-in-setup.py.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 88da522778fc6a7b256cda7f960912b439290538 Mon Sep 17 00:00:00 2001
-From: Matt Coleman <matt@datto.com>
-Date: Fri, 19 Jun 2020 19:06:24 -0400
-Subject: [PATCH] Do not install systemd files in setup.py
-
-setuptools should not perform OS-specific actions such as installing systemd units.
-OS-specific actions should be handled by the package manager.
----
- setup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 4518165..8dff55e 100755
---- a/setup.py
-+++ b/setup.py
-@@ -34,7 +34,6 @@ setup(
-                'scripts/targetcli',
-                'daemon/targetclid'
-               ],
--    data_files = [('/lib/systemd/system', ['systemd/targetclid.socket', 'systemd/targetclid.service'])],
-     classifiers = [
-         "Programming Language :: Python",
-         "Programming Language :: Python :: 3",
--- 
-2.27.0
-
diff --git a/sources b/sources
index a212e8a..c99883a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (targetcli-fb-2.1.53.tar.gz) = acefa7f8df8ee901cae8f04cbeb264d6024100e2d8b8343024bc52842af88a23d1bf5dd880ff2c77046bd8da8493630b4e357103617c02d1a90947e42c3a7c92
+SHA512 (targetcli-fb-2.1.54.tar.gz) = dd008b8c47acc095078454c94b0c6f19ba88f86ddf1b5335eb050abf61d89ce1ffb7411ff3a174de60ed9759e6337206253aa9b2def6497b85c884a0a111308d
diff --git a/targetcli.spec b/targetcli.spec
index 97df712..182c579 100644
--- a/targetcli.spec
+++ b/targetcli.spec
@@ -3,13 +3,12 @@
 Name:           targetcli
 License:        ASL 2.0
 Summary:        An administration shell for storage targets
-Version:        2.1.53
-Release:        3%{?dist}
+Version:        2.1.54
+Release:        1%{?dist}
 URL:            https://github.com/open-iscsi/%{oname}
 Source:         %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz
 # Proposed upstream
 ## From: https://github.com/open-iscsi/targetcli-fb/pull/176
-Patch1:         Do-not-install-systemd-files-in-setup.py.patch
 BuildArch:      noarch
 BuildRequires:  python3-devel, python3-setuptools, systemd-rpm-macros
 Requires:       python3-rtslib, target-restore, python3-configshell, python3-six, python3-dbus
@@ -24,7 +23,6 @@ users will also need to install and use fcoe-utils.
 
 %prep
 %setup -q -n %{oname}-%{version}
-%patch1 -p1
 
 %build
 %py3_build
@@ -49,6 +47,9 @@ install -m 644 systemd/* %{buildroot}%{_unitdir}/
 %dir %{_sysconfdir}/target/backup
 
 %changelog
+* Mon May 17 2021 Maurizio Lombardi <mlombard@redhat.com> - 2.1.54-1
+- Update to version 2.1.54
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.53-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild