[packages/open-iscsi] - added systemd macros

[baggins]

commit 73d24d5e829ad5cd1b399f95fc288cb320b17a65
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Apr 1 12:05:47 2014 +0200

    - added systemd macros

 open-iscsi.spec | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/open-iscsi.spec b/open-iscsi.spec
index 7664f9b..def249a 100644
--- a/open-iscsi.spec
+++ b/open-iscsi.spec
@@ -36,7 +36,7 @@ Patch45:	0066-start-socket-listeners-on-iscsiadm-command.patch
 URL:		http://www.open-iscsi.org/
 BuildRequires:	kmod-devel
 BuildRequires:	openssl-devel
-BuildRequires:	rpmbuild(macros) >= 1.379
+BuildRequires:	rpmbuild(macros) >= 1.671
 %if %{with dynamic}
 BuildRequires:	openslp-devel
 BuildRequires:	sed >= 4.0
@@ -46,7 +46,9 @@ BuildRequires:	glibc-static
 BuildRequires:	openslp-static
 %endif
 Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun,postun):	systemd-units >= 38
 Requires:	rc-scripts
+Requires:	systemd-units >= 38
 Suggests:	multipath-tools
 Provides:	group(iscsi)
 Provides:	user(iscsi)
@@ -156,6 +158,8 @@ if ! grep -q "^InitiatorName=[^ \t\n]" %{_sysconfdir}/iscsi/initiatorname.iscsi
 fi
 /sbin/chkconfig --add iscsi
 /sbin/chkconfig --add iscsid
+NORESTART=1
+%systemd_post iscsi.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
 
 %preun
 if [ "$1" = "0" ]; then
@@ -164,12 +168,19 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del iscsid
 	/sbin/chkconfig --del iscsi
 fi
+%systemd_preun iscsi.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
 
 %postun
 if [ "$1" = "0" ]; then
 	%userremove iscsi
 	%groupremove iscsi
 fi
+%systemd_reload
+
+%triggerpostun -- %{name} < 2.0.873-1
+%systemd_trigger iscsi.service iscsid.service iscsiuio.service
+/bin/systemctl --quiet enable iscsid.socket || :
+/bin/systemctl --quiet enable iscsiuio.socket || :
 
 %files
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/open-iscsi.git/commitdiff/73d24d5e829ad5cd1b399f95fc288cb320b17a65