From f5b66c30499af290eb61262ee8f60221a61a7409 Mon Sep 17 00:00:00 2001
From: Matt Coleman <matt@datto.com>
Date: Thu, 25 Jun 2020 17:54:06 -0400
Subject: [PATCH] version 2.1.53-1

* new upstream version
* use the systemd unit files from the upstream repository
* Add proposed upstream patch:
  - Do not install systemd files in setup.py
  - https://github.com/open-iscsi/targetcli-fb/pull/176
---
 .gitignore                                    |  1 +
 ...ot-install-systemd-files-in-setup.py.patch | 26 +++++++++++++++++++
 sources                                       |  2 +-
 targetcli.spec                                | 25 ++++++++++++++----
 4 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 Do-not-install-systemd-files-in-setup.py.patch

diff --git a/.gitignore b/.gitignore
index cbf37f8..eadb92c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@
 /targetcli-fb-2.1.fb46.tar.gz
 /targetcli-fb-2.1.fb48.tar.gz
 /targetcli-fb-2.1.fb49.tar.gz
+/targetcli-fb-2.1.53.tar.gz
diff --git a/Do-not-install-systemd-files-in-setup.py.patch b/Do-not-install-systemd-files-in-setup.py.patch
new file mode 100644
index 0000000..5bb02bc
--- /dev/null
+++ b/Do-not-install-systemd-files-in-setup.py.patch
@@ -0,0 +1,26 @@
+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 e80d9f7..a212e8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (targetcli-fb-2.1.fb49.tar.gz) = 05fb6f638f808bf09089bdd110592b3ed3be49fc70cc1a71680de7bff40dc88425e69e9a99fdfcab712646cf131f78071edae46f214fdfee4b7090f47933c93a
+SHA512 (targetcli-fb-2.1.53.tar.gz) = acefa7f8df8ee901cae8f04cbeb264d6024100e2d8b8343024bc52842af88a23d1bf5dd880ff2c77046bd8da8493630b4e357103617c02d1a90947e42c3a7c92
diff --git a/targetcli.spec b/targetcli.spec
index 4aae6c5..1ec21d8 100644
--- a/targetcli.spec
+++ b/targetcli.spec
@@ -3,12 +3,15 @@
 Name:           targetcli
 License:        ASL 2.0
 Summary:        An administration shell for storage targets
-Version:        2.1.fb49
-Release:        9%{?dist}
+Version:        2.1.53
+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
+BuildRequires:  python3-devel, python3-setuptools, systemd-rpm-macros
 Requires:       python3-rtslib, target-restore, python3-configshell, python3-six, python3-dbus
 Requires:       python3-gobject-base
 
@@ -21,6 +24,7 @@ users will also need to install and use fcoe-utils.
 
 %prep
 %setup -q -n %{oname}-%{version}
+%patch1 -p1
 
 %build
 %py3_build
@@ -29,18 +33,29 @@ users will also need to install and use fcoe-utils.
 %py3_install
 mkdir -p %{buildroot}%{_sysconfdir}/target/backup
 mkdir -p %{buildroot}%{_mandir}/man8/
-install -m 644 targetcli.8 %{buildroot}%{_mandir}/man8/
+install -m 644 targetcli*.8 %{buildroot}%{_mandir}/man8/
+mkdir -p %{buildroot}%{_unitdir}/
+install -m 644 systemd/* %{buildroot}%{_unitdir}/
 
 %files
 %doc README.md
 %license COPYING
 %{python3_sitelib}/targetcli*
 %{_bindir}/targetcli
-%{_mandir}/man8/targetcli.8*
+%{_bindir}/targetclid
+%{_mandir}/man8/targetcli*.8*
+%{_unitdir}/*
 %dir %{_sysconfdir}/target
 %dir %{_sysconfdir}/target/backup
 
 %changelog
+* Thu Jun 25 2020 Matt Coleman <matt@datto.com> - 2.1.53-1
+- New upstream version
+- Add the upstream project's targetclid systemd unit files
+- Add proposed upstream patch:
+  + Do not install systemd files in setup.py
+  + https://github.com/open-iscsi/targetcli-fb/pull/176
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.1.fb49-9
 - Rebuilt for Python 3.9