From 9c2485911b4c791def75bf6c2b6b790f365d7ad2 Mon Sep 17 00:00:00 2001
From: mchristi <mchristi@fedoraproject.org>
Date: Jun 05 2006 17:50:57 +0000
Subject: update devel tree to r595


---

diff --git a/.cvsignore b/.cvsignore
index ac0f8d2..bb0ff30 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 open-iscsi-5.0.4.446.tar.gz
 open-iscsi-5.0.5.476.tar.bz2
+open-iscsi-5.0.5.595.tar.bz2
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 647d318..7f19253 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -1,10 +1,13 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
-Version: 5.0.5.476
-Release: 0.1
+Version: 5.0.5.595
+Release: 0
 Source0: http://people.redhat.com/mchristi/iscsi/FC5/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
-Patch0: open-iscsi-5.0.4.446-initscript.patch
-Patch1: open-iscsi-5.0.4.446-add-iscsi-iname.patch
+Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
+Patch1: open-iscsi-5.0.5.595-add-iscsi-iname.patch
+Patch2: open-iscsi-5.0.5.595-rm-reopen-max.patch
+Patch3: open-iscsi-5.0.5.595-fc-version.patch
+
 Group: System Environment/Daemons
 License: GPL
 URL: http://www.open-iscsi.org
@@ -22,8 +25,10 @@ Protocol networks.
 %prep
 %setup -q -n %{name}-%{version} -c
 cd open-iscsi-%{version}
-%patch0 -p1 -b .initscript
+%patch0 -p1 -b .update-initscripts-and-docs
 %patch1 -p1 -b .add-iscsi-iname
+%patch2 -p1 -b .rm-reopen-max
+%patch3 -p1 -b .fc-version
 
 %build
 cd open-iscsi-%{version}
@@ -38,7 +43,7 @@ mkdir -p $RPM_BUILD_ROOT/sbin
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/var/db/iscsi/
-install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname $RPM_BUILD_ROOT/sbin
+install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart $RPM_BUILD_ROOT/sbin
 install -m 644 doc/iscsiadm.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m 644 doc/iscsid.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m 755 etc/initd/initd.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
@@ -48,6 +53,10 @@ install -m 644 etc/iscsid.conf $RPM_BUILD_ROOT/etc
 rm -rf $RPM_BUILD_ROOT
 
 %post
+if [ ! -f /etc/initiatorname.iscsi ]; then
+	echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/initiatorname.iscsi
+fi
+
 /sbin/chkconfig --add iscsi
 
 %preun
@@ -55,7 +64,6 @@ if [ "$1" = "0" ]; then
     /sbin/chkconfig --del iscsi
 fi
 
-
 %files
 %defattr(-,root,root)
 %config /etc/rc.d/init.d/iscsi
@@ -66,6 +74,26 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Tue May 30 2006 Mike Christie <mchristi@redhat.com>
+- rebase package to svn rev 595 to fix several bugs
+  NOTE!!!!!!!! This is not compatible with the older open-iscsi modules
+  and tools. You must upgrade.
+
+* Thu May 18 2006 Mike Christie <mchristi@redhat.com>
+- update package to open-iscsi svn rev 571
+  NOTE!!!!!!!! This is not compatible with the older open-iscsi modules
+  and tools. You must upgrade.
+
+* Fri Apr 7 2006 Mike Christie <mchristi@redhat.com>
+- From Andy Henson <andy@zexia.co.uk>:
+  Autogenerate /etc/initiatorname.iscsi during install if not already present
+- Remove code to autogenerate /etc/initiatorname.iscsi from initscript
+- From dan.y.roche@gmail.com:
+  add touch and rm lock code
+- update README
+- update default iscsid.conf. "cnx" was not supported. The correct
+  id was "conn".
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 5.0.5.476-0.1
 - bump again for double-long bug on ppc(64)
 
diff --git a/sources b/sources
index e3253a0..c16182e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f2308e910fb953012cdce1373358809  open-iscsi-5.0.5.476.tar.bz2
+0209e5ff0885eee23e3730c6328d8594  open-iscsi-5.0.5.595.tar.bz2