diff --git a/_service b/_service
index 6a2b6ed..425ede5 100644
--- a/_service
+++ b/_service
@@ -7,7 +7,7 @@
@PARENT_TAG@
v(\d*\.\d*\.)(\d*)
\1\2
- v2.1.53
+ v2.1.54
enable
diff --git a/_servicedata b/_servicedata
index a5139c4..b5e6a79 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/open-iscsi/targetcli-fb.git
- ff7766b737c0868ae2579da49f2e8304f40767ee
\ No newline at end of file
+ 033cf1c2d34c73cce84c4c12c7383188167bf9e5
\ No newline at end of file
diff --git a/fix-setup-install.patch b/fix-setup-install.patch
deleted file mode 100644
index 46be02a..0000000
--- a/fix-setup-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Lee Duncan
-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",
diff --git a/targetcli-fb-2.1.53.tar.xz b/targetcli-fb-2.1.53.tar.xz
deleted file mode 100644
index 9d2443b..0000000
--- a/targetcli-fb-2.1.53.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09b2e5640d9316c612f0a5ba055c4ace4a3051685c8a38eee9366ef9adceb81c
-size 34212
diff --git a/targetcli-fb-2.1.54.tar.xz b/targetcli-fb-2.1.54.tar.xz
new file mode 100644
index 0000000..6a85bea
--- /dev/null
+++ b/targetcli-fb-2.1.54.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fa7bfc19ba948b0122888330e7c411c0cfe7990f6db2aca5b9f403c03e6220d
+size 34184
diff --git a/targetcli-fb.changes b/targetcli-fb.changes
index 7732797..cb4669a 100644
--- a/targetcli-fb.changes
+++ b/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
diff --git a/targetcli-fb.spec b/targetcli-fb.spec
index 463821c..ea9034a 100644
--- a/targetcli-fb.spec
+++ b/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