From cb43579c30b8db9addf77a5921cee5e9738a853f Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com>
Date: Oct 05 2015 19:47:28 +0000
Subject: added libiscsi session API patch


added libiscsi session API patch (bz #1262279)
fixed broken multiple trigger scripts, removed old pre-systemd migration triggers

---

diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 74408ef..a5c2667 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -5,7 +5,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
-Release: 27.git%{checkout}%{?dist}
+Release: 28.git%{checkout}%{?dist}
 Group: System Environment/Daemons
 License: GPLv2+
 URL: http://www.open-iscsi.org
@@ -37,6 +37,7 @@ Patch19: 0019-updates-to-iscsi.service.patch
 Patch20: 0020-make-session-shutdown-a-seperate-service.patch.patch
 Patch22: 0022-honor-all-requested-delays-in-iscsi_sched_ev_context.patch
 Patch23: 0023-Add-macros-to-release-GIL-lock.patch
+Patch24: 0024-libiscsi-introduce-sessions-api.patch
 # ugly version string patch, should change with every rebuild
 Patch9999: 9999-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
 
@@ -207,29 +208,7 @@ fi
 %postun iscsiuio
 %systemd_postun
 
-%triggerun -- iscsi-initiator-utils < 6.2.0.873-1
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply iscsid
-# and systemd-sysv-convert --apply iscsi
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save iscsi >/dev/null 2>&1 ||:
-/usr/bin/systemd-sysv-convert --save iscsid >/dev/null 2>&1 ||:
-
-# enable socket activation
-/bin/systemctl enable iscsid.socket >/dev/null 2>&1 || :
-/bin/systemctl enable iscsiuio.socket >/dev/null 2>&1 || :
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del iscsid >/dev/null 2>&1 || :
-/sbin/chkconfig --del iscsi >/dev/null 2>&1 || :
-/bin/systemctl try-restart iscsid.service >/dev/null 2>&1 || :
-/bin/systemctl try-restart iscsi.service >/dev/null 1>&1 || :
-
-%triggerun iscsiuio -- iscsi-initiator-utils < 6.2.0.873-1
-# enable socket activation
-/bin/systemctl enable iscsiuio.socket >/dev/null 2>&1 || :
-
-%triggerun -- iscsi-initiator-utils < 6.2.0.873-24
+%triggerun -- iscsi-initiator-utils < 6.2.0.873-25
 # prior to 6.2.0.873-24 iscsi.service was missing a Wants=remote-fs-pre.target
 # this forces remote-fs-pre.target active if needed for a clean shutdown/reboot
 # after upgrading this package
@@ -249,12 +228,12 @@ if [ $1 -gt 0 ]; then
         fi
     fi
 fi
-
-%triggerun -- iscsi-initiator-utils < 6.2.0.873-25
+# added in 6.2.0.873-25
 if [ $1 -gt 0 ]; then
     systemctl start iscsi-shutdown.service >/dev/null 2>&1 || :
 fi
 
+
 %files
 %doc README
 %dir %{_sharedstatedir}/iscsi
@@ -304,6 +283,10 @@ fi
 %{python3_sitearch}/*
 
 %changelog
+* Mon Oct 05 2015 Chris Leech <cleech@redhat.com> - 6.2.0.873-28.git6aa2c9b
+- fixed broken multiple trigger scripts, removed old pre-systemd migration triggers
+- added libiscsi session API patch (bz #1262279)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.873-27.git6aa2c9b
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild