iscsi-initiator-utils: Clean up package.

There it nothing too new in here, but a lot of minor bugs
have been fixed:

* Removed NetworkManager scripts which we don't use.
* Copy configuration file to right directory.
* Sanitize paths by using variables.
* Add scriptlet that creates initiator name configuration..

diff --git a/iscsi-initiator-utils/04-iscsi b/iscsi-initiator-utils/04-iscsi
deleted file mode 100755 (executable)
index 58aa798..0000000
--- a/iscsi-initiator-utils/04-iscsi
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-export LC_ALL=C
-
-if [ "$2" = "down" ]; then
-       if ! /sbin/ip route ls | grep -q ^default &&
-          [ -f /var/lock/subsys/iscsi ]; then
-               /etc/rc.d/init.d/iscsi stop
-       fi
-fi
-
-if [ "$2" = "up" ]; then
-       if /sbin/ip -o route show dev "$1" | grep -q '^default' && 
-          /sbin/chkconfig iscsi; then
-               /etc/rc.d/init.d/iscsi start
-       fi
-fi

diff --git a/iscsi-initiator-utils/iscsi-initiator-utils.nm b/iscsi-initiator-utils/iscsi-initiator-utils.nm
index 21ccd2ceb05a4874a13deb83f996f42e1405c02a..7049a9c86fb41c89f4e811393342165634834180 100644 (file)
--- a/iscsi-initiator-utils/iscsi-initiator-utils.nm
+++ b/iscsi-initiator-utils/iscsi-initiator-utils.nm
@@ -5,17 +5,17 @@
 
 name       = iscsi-initiator-utils
 version    = 6.2.0.872
-release    = 2
+release    = 3
 
-groups     = Networking/Tools
-url        = http://bridge.sourceforge.net/
+groups     = System/Daemons
+url        = http://www.open-iscsi.org/
 license    = GPLv2+
 summary    = iSCSI daemon and utility programs.
 
 description
-       The iscsi package provides the server daemon for the iSCSI protocol, \
-       as well as the utility programs used to manage it. iSCSI is a protocol \
-       for distributed disk access using SCSI commands sent over Internet \
+       The iscsi package provides the server daemon for the iSCSI protocol,
+       as well as the utility programs used to manage it. iSCSI is a protocol
+       for distributed disk access using SCSI commands sent over Internet
        Protocol networks.
 end
 
@@ -46,37 +46,47 @@ build
        end
 
        install
-               mkdir -pv %{BUILDROOT}/sbin
-               mkdir -pv %{BUILDROOT}/usr/share/man/man8
-               mkdir -pv %{BUILDROOT}/etc/{iscsi,sysconfig}
-               mkdir -pv %{BUILDROOT}/etc/NetworkManager/dispatcher.d
-               mkdir -pv %{BUILDROOT}/var/lib/iscsi/{nodes,send_targets,static,isns,slp,ifaces}
-               mkdir -pv %{BUILDROOT}/var/lock/iscsi
-               mkdir -pv %{BUILDROOT}/usr/include
+               mkdir -pv %{BUILDROOT}%{sbindir}
+               mkdir -pv %{BUILDROOT}%{mandir}/man8
+               mkdir -pv %{BUILDROOT}%{sysconfdir}/iscsi
+               mkdir -pv %{BUILDROOT}%{localstatedir}/iscsi/{nodes,send_targets,static,isns,slp,ifaces}
+               mkdir -pv %{BUILDROOT}%{includedir}
                mkdir -pv %{BUILDROOT}%{libdir}
-               mkdir -pv %{BUILDROOT}%{libdir}/python2.7/site-packages
+               mkdir -pv %{BUILDROOT}%{python_sitelib}
 
                install -p -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart \
-                       %{BUILDROOT}/sbin
-               install -p -m 644 doc/iscsiadm.8 %{BUILDROOT}/usr/share/man/man8
-               install -p -m 644 doc/iscsid.8 %{BUILDROOT}/usr/share/man/man8
-               install -p -m 644 etc/iscsid.conf %{BUILDROOT}/etc/sysconfig/iscsi
-               install -p -m 644 doc/iscsistart.8 %{BUILDROOT}/usr/share/man/man8
-               install -p -m 644 doc/iscsi-iname.8 %{BUILDROOT}/usr/share/man/man8
-
-               install -p -m 755 %{DIR_SOURCE}/04-iscsi %{BUILDROOT}/etc/NetworkManager/dispatcher.d
+                       %{BUILDROOT}%{sbindir}
+               install -p -m 644 doc/iscsiadm.8 %{BUILDROOT}%{mandir}/man8
+               install -p -m 644 doc/iscsid.8 %{BUILDROOT}%{mandir}/man8
+               install -p -m 644 etc/iscsid.conf %{BUILDROOT}%{sysconfdir}/iscsi
+               install -p -m 644 doc/iscsistart.8 %{BUILDROOT}%{mandir}/man8
+               install -p -m 644 doc/iscsi-iname.8 %{BUILDROOT}%{mandir}/man8
 
                install -p -m 755 libiscsi/libiscsi.so.0 %{BUILDROOT}%{libdir}
                ln -svf libiscsi.so.0 %{BUILDROOT}%{libdir}/libiscsi.so
-               install -p -m 644 libiscsi/libiscsi.h %{BUILDROOT}/usr/include
+               install -p -m 644 libiscsi/libiscsi.h %{BUILDROOT}%{includedir}
 
                install -p -m 755 libiscsi/build/lib.linux-*/libiscsimodule.so \
-                       %{BUILDROOT}%{libdir}/python2.7/site-packages
+                       %{BUILDROOT}%{python_sitelib}
        end
 end
 
 packages
        package %{name}
+               requires
+                       libiscsi = %{thisver}
+               end
+
+               configfiles
+                       %{sysconfdir}/iscsi/iscsid.conf
+               end
+
+               script postin
+                       if [ ! -f "%{sysconfdir}/iscsi/initiatorname.iscsi" ]; then
+                               echo "InitiatorName=$(iscsi-iname)" > %{sysconfdir}/iscsi/initiatorname.iscsi
+                       fi
+               end
+       end
 
        package libiscsi
                template LIBS

diff --git a/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch b/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch
deleted file mode 100644 (file)
index c29c77b..0000000
--- a/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurp open-iscsi-2.0-871.1.1-bnx2i/utils/iscsi-iname.c open-iscsi-2.0-871.1.1-bnx2i.work/utils/iscsi-iname.c
---- open-iscsi-2.0-871.1.1-bnx2i/utils/iscsi-iname.c   2010-01-15 02:24:02.000000000 -0600
-+++ open-iscsi-2.0-871.1.1-bnx2i.work/utils/iscsi-iname.c      2010-01-15 03:44:23.000000000 -0600
-@@ -73,7 +73,7 @@ main(int argc, char *argv[])
-                       exit(0);
-               }
-       } else {
--              prefix = "iqn.2005-03.org.open-iscsi";
-+              prefix = "iqn.1994-05.com.redhat";
-       }
- 
-       /* try to feed some entropy from the pool to MD5 in order to get