From 4214fd71875edffcf32d323c109070a15e99c394 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.com>
Date: Sun, 22 Apr 2018 13:06:05 +0000
Subject: [PATCH] Accepting request 598817 from
 home:mcgrof:branches:filesystems

- Fix SLE15 build (bsc#1090290) due to systemd. Systemd is present since
  OpenSUSE Leap 42.1 and SLE12-SP1, so we need to ensure the build
  has systemd available on these release. We also then need to indicate
  the new files installed when on systemd. So this fixes the build issue
  on SLE15 and also makes available the systemd service unit files now
  on all releases which support systemd.

OBS-URL: https://build.opensuse.org/request/show/598817
OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsprogs?expand=0&rev=66
---
 xfsprogs.changes | 10 ++++++++++
 xfsprogs.spec    | 18 ++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/xfsprogs.changes b/xfsprogs.changes
index 9a3b856..5fe60b6 100644
--- a/xfsprogs.changes
+++ b/xfsprogs.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Apr 19 20:46:25 UTC 2018 - lurodriguez@suse.com
+
+- Fix SLE15 build (bsc#1090290) due to systemd. Systemd is present since
+  OpenSUSE Leap 42.1 and SLE12-SP1, so we need to ensure the build
+  has systemd available on these release. We also then need to indicate
+  the new files installed when on systemd. So this fixes the build issue
+  on SLE15 and also makes available the systemd service unit files now
+  on all releases which support systemd.
+
 -------------------------------------------------------------------
 Tue Apr 17 21:02:42 UTC 2018 - olaf@aepfle.de
 
diff --git a/xfsprogs.spec b/xfsprogs.spec
index f86f009..faba5bb 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -48,7 +48,11 @@ BuildRequires:  suse-module-tools
 %endif
 BuildRequires:  xz
 Requires(post): coreutils
-
+# Starting with OpenSUSE Leap 42.1 and SLE12-SP1 we get systemd
+%if 0%{?sle_version} >= 120100
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(systemd)
+%endif
 %description
 A set of commands to use the XFS file system, including mkfs.xfs.
 
@@ -91,7 +95,10 @@ autoconf
 export OPTIMIZER="-fPIC"
 export DEBUG=-DNDEBUG
 export LIBUUID=%{_libdir}/libuuid.a
-%configure --enable-readline=yes
+%if 0%{?sle_version} >= 120100
+export USE_SYSTEMD="--with-systemd-unit-dir=%{_unitdir}"
+%endif
+%configure --enable-readline=yes $USE_SYSTEMD
 make %{?_smp_mflags} V=1
 
 PATH_TO_HELP="%{_dracutmodulesdir}/95suse-xfs/dracut-fsck-help.txt"
@@ -138,6 +145,13 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
 %{_libdir}/libhandle.so.*
 %dir %{_libdir}/xfsprogs/
 %{_libdir}/xfsprogs/xfs_scrub_all.cron
+%if 0%{?sle_version} >= 120100
+%{_libdir}/xfsprogs/xfs_scrub_fail
+%{_unitdir}/xfs_scrub@.service
+%{_unitdir}/xfs_scrub_all.service
+%{_unitdir}/xfs_scrub_all.timer
+%{_unitdir}/xfs_scrub_fail@.service
+%endif
 %doc %{_mandir}/man[258]/*
 %doc %{_defaultdocdir}/%{name}
 %dir %{_libexecdir}/dracut