rpms/scsi-target-utils/devel .cvsignore, 1.7, 1.8 scsi-target-utils-redhatify-docs.patch, 1.1, 1.2 scsi-target-utils.spec, 1.14, 1.15 sources, 1.7, 1.8 tgtd.init, 1.2, 1.3

Sun Jan 24 22:53:40 UTC 2010

Author: ruben

Update of /cvs/pkgs/rpms/scsi-target-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28649

Modified Files:
	.cvsignore scsi-target-utils-redhatify-docs.patch 
	scsi-target-utils.spec sources tgtd.init 
Log Message:
* Sun Jan 24 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> - 1.0.1-1
- Update to new upstream release
- Upstream moved to Sourceforge
- Fix %preun snippet (#532176)
- Start after network service but before iscsid. Prevents failed mounts from localhost at boot.
- Replace paths with macros in spec
- Add one more doc



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8

--- .cvsignore	22 Dec 2009 11:12:20 -0000	1.7
+++ .cvsignore	24 Jan 2010 22:53:38 -0000	1.8
@@ -1 +1 @@
-tgt-20091205.tar.bz2
+tgt-1.0.1.tar.gz

scsi-target-utils-redhatify-docs.patch:
 README           |   20 --------------------
 doc/README.iscsi |   16 +++++++++-------
 doc/README.iser  |   37 +++++++++++++++----------------------
 3 files changed, 24 insertions(+), 49 deletions(-)

Index: scsi-target-utils-redhatify-docs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/scsi-target-utils-redhatify-docs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scsi-target-utils-redhatify-docs.patch	22 Dec 2009 11:12:21 -0000	1.1
+++ scsi-target-utils-redhatify-docs.patch	24 Jan 2010 22:53:38 -0000	1.2
@@ -20,14 +20,17 @@ index 22785fc..22b963f 100644
  tgt can emulate the following device types:
  
  - SBC: a virtual disk drive that can use a file to store the content.
-@@ -40,12 +29,6 @@ store the content (in progress).
+@@ -40,15 +29,6 @@ store the content (in progress).
  The code is under the GNU General Public License version 2.
  
  
 -Preparation
 --------------
--Target drivers have their own ways to build, configure, etc. So find
--an appropriate documentation in the doc directory.
+-Target drivers have their own ways to build, configure, etc. Please
+-find an appropriate documentation in the doc directory. You might find
+-other useful information on tgt's site:
+-
+-http://stgt.sourceforge.net/
 -
 -
  Developer Notes
@@ -73,7 +76,6 @@ index 321b1d8..cd63de2 100644
  The following example creates a target with id 1 (the iqn is
  iqn.2001-04.com.example:storage.disk2.amiens.sys1.xyz) and adds a
 diff --git a/doc/README.iser b/doc/README.iser
-index 2361c4e..92edc61 100644
 --- a/doc/README.iser
 +++ b/doc/README.iser
 @@ -1,6 +1,21 @@


Index: scsi-target-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/scsi-target-utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- scsi-target-utils.spec	22 Dec 2009 11:12:21 -0000	1.14
+++ scsi-target-utils.spec	24 Jan 2010 22:53:38 -0000	1.15
@@ -1,15 +1,12 @@
-%define         date 20091205
-
 Name:           scsi-target-utils
-Version:        0.9.11
-Release:        1.%{date}snap%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        The SCSI target daemon and utility programs
 
 Group:          System Environment/Daemons
 License:        GPLv2
-URL:            http://stgt.berlios.de
-#Source0:        http://stgt.berlios.de/releases/tgt-%{version}.tar.bz2
-Source0:        http://people.redhat.com/mchristi/target/tgt/snapshots/tgt-%{date}.tar.bz2
+URL:            http://stgt.sourceforge.net/
+Source0:        http://stgt.sourceforge.net/releases/tgt-%{version}.tar.gz
 Source1:        tgtd.init
 Source2:        sysconfig.tgtd
 Source3:        targets.conf
@@ -30,7 +27,7 @@ Currently, software iSCSI targets are su
 
 
 %prep
-%setup -q -n tgt-%{date}
+%setup -q -n tgt-%{version}
 %patch0 -p1 -b .redhatify-docs
 %patch1 -p1 -b .dynamic-link-iser
 %patch2 -p1 -b .hack-check-for-eventfd
@@ -48,8 +45,8 @@ popd
 %{__install} -d %{buildroot}%{_sbindir}
 %{__install} -d %{buildroot}%{_mandir}/man8
 %{__install} -d %{buildroot}%{_initrddir}
-%{__install} -d %{buildroot}/etc/tgt
-%{__install} -d %{buildroot}/etc/sysconfig
+%{__install} -d %{buildroot}%{_sysconfdir}/tgt
+%{__install} -d %{buildroot}%{_sysconfdir}/sysconfig
 
 %{__install} -p -m 0755 scripts/tgt-setup-lun %{buildroot}%{_sbindir}
 %{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/tgtd
@@ -57,8 +54,8 @@ popd
 %{__install} -p -m 0644 doc/manpages/tgtadm.8 %{buildroot}/%{_mandir}/man8
 %{__install} -p -m 0644 doc/manpages/tgt-admin.8 %{buildroot}/%{_mandir}/man8
 %{__install} -p -m 0644 doc/manpages/tgt-setup-lun.8 %{buildroot}/%{_mandir}/man8
-%{__install} -p -m 0600 %{SOURCE2} %{buildroot}/etc/sysconfig/tgtd
-%{__install} -p -m 0600 %{SOURCE3} %{buildroot}/etc/tgt
+%{__install} -p -m 0600 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/tgtd
+%{__install} -p -m 0600 %{SOURCE3} %{buildroot}%{_sysconfdir}/tgt
 
 pushd usr
 %{__make} install DESTDIR=%{buildroot} sbindir=%{_sbindir}
@@ -68,13 +65,13 @@ pushd usr
 /sbin/chkconfig --add tgtd
 
 %postun
-if [ "$1" = "1" ] ; then
+if [ "$1" -ge "1" ] ; then
      /sbin/service tgtd condrestart > /dev/null 2>&1 || :
 fi
 
 %preun
 if [ "$1" = "0" ] ; then
-     /sbin/chkconfig tgtd stop > /dev/null 2>&1
+     /sbin/service tgtd stop > /dev/null 2>&1 || :
      /sbin/chkconfig --del tgtd
 fi
 
@@ -85,7 +82,7 @@ fi
 
 %files
 %defattr(-, root, root, -)
-%doc README doc/README.iscsi doc/README.iser doc/README.lu_configuration doc/README.mmc
+%doc README doc/README.iscsi doc/README.iser doc/README.lu_configuration doc/README.mmc doc/README.ssc
 %{_sbindir}/tgtd
 %{_sbindir}/tgtadm
 %{_sbindir}/tgt-setup-lun
@@ -93,11 +90,19 @@ fi
 %{_sbindir}/tgtimg
 %{_mandir}/man8/*
 %{_initrddir}/tgtd
-%attr(0600,root,root) %config(noreplace) /etc/sysconfig/tgtd
-%attr(0600,root,root) %config(noreplace) /etc/tgt/targets.conf
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/tgtd
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/tgt/targets.conf
 
 
 %changelog
+* Sun Jan 24 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> - 1.0.1-1
+- Update to new upstream release
+- Upstream moved to Sourceforge
+- Fix %%preun snippet (#532176)
+- Start after network service but before iscsid. Prevents failed mounts from localhost at boot.
+- Replace paths with macros in spec
+- Add one more doc
+
 * Mon Dec 21 2009 Hans de Goede <hdegoede at redhat.com> - 0.9.11-1.20091205snap
 - Rebase to 0.9.11 + some fixes from git (git id
   97832d8dcd00202a493290b5d134b581ce20885c)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	22 Dec 2009 11:12:21 -0000	1.7
+++ sources	24 Jan 2010 22:53:38 -0000	1.8
@@ -1 +1 @@
-6f469f376b1ceb00725ceb00b2f1e6f8  tgt-20091205.tar.bz2
+46f5bf01f9002b32a57e5def3f5e4543  tgt-1.0.1.tar.gz


Index: tgtd.init
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/tgtd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tgtd.init	22 Dec 2009 11:12:21 -0000	1.2
+++ tgtd.init	24 Jan 2010 22:53:39 -0000	1.3
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig: - 39 35
+# chkconfig: - 11 89
 #
 ### BEGIN INIT INFO
 # Provides:          tgtd

