SPECS: open-iscsi.spec - fixed files section and initscript

[kosmo]

Author: kosmo                        Date: Mon Mar  3 16:10:48 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed files section and initscript

---- Files affected:
SPECS:
   open-iscsi.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/open-iscsi.spec
diff -u SPECS/open-iscsi.spec:1.9 SPECS/open-iscsi.spec:1.10
--- SPECS/open-iscsi.spec:1.9	Fri Feb  8 11:02:40 2008
+++ SPECS/open-iscsi.spec	Mon Mar  3 17:10:42 2008
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 %define		_rc  865.15
-%define		_rel 1
+%define		_rel 2
 Summary:	iSCSI - SCSI over IP
 Summary(pl.UTF-8):	iSCSI - SCSI po IP
 Name:		open-iscsi
@@ -17,6 +17,8 @@
 BuildRequires:	rpmbuild(macros) >= 1.379
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
+Provides:	group(iscsi)
+Provides:	user(iscsi)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -49,28 +51,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{1,5,8},/etc/{rc.d/init.d,sysconfig}}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,/etc/{iscsi/ifaces,iscsi/nodes,iscsi/send_targets,rc.d/init.d,sysconfig}}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/iscsi
 
-:> $RPM_BUILD_ROOT%{_sysconfdir}/initiatorname.iscsi
-
-install etc/iscsid.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install etc/iscsid.conf $RPM_BUILD_ROOT%{_sysconfdir}/iscsi
+:> $RPM_BUILD_ROOT%{_sysconfdir}/iscsi/initiatorname.iscsi
 
 install usr/{iscsid,iscsiadm,iscsistart} utils/iscsi-iname $RPM_BUILD_ROOT%{_sbindir}
 install utils/fwparam_ibft/fwparam_ibft $RPM_BUILD_ROOT%{_sbindir}
 
+install doc/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+%groupadd -g 223 iscsi
+%useradd -u 223 -d /tmp -s /bin/false -c "iSCSI Daemon" -g iscsi iscsi
+
 %post
 if ! grep -q "^InitiatorName=[^ \t\n]" %{_sysconfdir}/initiatorname.iscsi 2>/dev/null ; then
-	echo "InitiatorName=$(hostname -f)" >> %{_sysconfdir}/initiatorname.iscsi
+	echo "InitiatorName=$(iscsi-iname)" >> %{_sysconfdir}/initiatorname.iscsi
 fi
-
 /sbin/chkconfig --add iscsi
-#%%service iscsi restart
 
 %preun
 if [ "$1" = "0" ]; then
@@ -78,14 +83,25 @@
 	/sbin/chkconfig --del iscsi
 fi
 
+%postun
+if [ "$1" = "0" ]; then
+	%userremove iscsi
+	%groupremove iscsi
+fi
+
 %files
 %defattr(644,root,root,755)
-%doc README THANKS
-%attr(755,root,root) %{_sbindir}/*
-%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/iscsid.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/initiatorname.iscsi
-%attr(754,root,root) /etc/rc.d/init.d/iscsi
+%doc ChangeLog README THANKS
+%dir %{_sysconfdir}/iscsi
+%dir %{_sysconfdir}/iscsi/ifaces
+%dir %{_sysconfdir}/iscsi/nodes
+%dir %{_sysconfdir}/iscsi/send_targets
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/iscsi/iscsid.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/iscsi/initiatorname.iscsi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/iscsi
+%attr(754,root,root) /etc/rc.d/init.d/iscsi
+%attr(755,root,root) %{_sbindir}/*
+%{_mandir}/man8/*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -93,6 +109,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2008-03-03 16:10:42  kosmo
+- fixed files section and initscript
+
 Revision 1.9  2008-02-08 10:02:40  arekm
 - up to 865.15; drop kernel module (it's already in upstream kernel)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/open-iscsi.spec?r1=1.9&r2=1.10&f=u