diff --git a/.cvsignore b/.cvsignore index 39508d9..aca2a19 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -linux-iscsi-user-4.0.1.8.tgz +open-iscsi-5.0.0.4_446.tar.gz diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index f5dc39f..5f9e35e 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -1,19 +1,19 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils -Version: 4.0.1.8 -Release: 0.1 -Source0: http://prdownloads.sourceforge.net/linux-iscsi/linux-iscsi-user-%{version}.tgz -Patch0: linux-iscsi-4.0.1.8-redhatify.patch -Patch1: linux-iscsi-4.0.1.8-remove_kerneldeps.patch +Version: 5.0.0.4_446 +Release: 0 +Source0: http://people.redhat.com/mchristi/iscsi/FC5/open-iscsi/rpm/open-iscsi-%{version}.tar.gz +Patch0: open-iscsi-5.0.0.4_446-initscript.patch +Patch1: open-iscsi-5.0.0.4_446-rm-rdma.patch +Patch2: open-iscsi-5.0.0.4_446-add-iscsi-iname.patch Group: System Environment/Daemons License: GPL -URL: http://linux-iscsi.sourceforge.net/ +URL: http://www.open-iscsi.org Buildroot: %{_tmppath}/%{name}-root -BuildRequires: sysfsutils-devel Requires: kernel +BuildRequires: openssl-devel db4-devel Prereq: /sbin/chkconfig ExcludeArch: s390 s390x -Obsoletes: iscsi %description The iscsi package provides the server daemon for the iSCSI protocol, @@ -23,33 +23,29 @@ Protocol networks. %prep %setup -q -n %{name}-%{version} -c -cd linux-iscsi-%{version} -%patch0 -p1 -b .redhatify -%patch1 -p1 -b .remkdep +cd open-iscsi-%{version} +%patch0 -p1 -b .initscript +%patch1 -p1 -b .rm-rdma +%patch2 -p1 -b .add-iscsi-iname %build -cd linux-iscsi-%{version} -make daemon utils +cd open-iscsi-%{version} +make -C usr +make -C utils %install -cd linux-iscsi-%{version} +cd open-iscsi-%{version} rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT{/sbin,/dev/iscsi} -mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8} +mkdir -p $RPM_BUILD_ROOT/sbin +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -install -s -m 755 obj/iscsid obj/utils/iscsi-device obj/utils/iscsi-iname obj/utils/iscsi-ls obj/utils/iscsi-id $RPM_BUILD_ROOT/sbin -# iscsi-mountall is not necessary because we're using _netdev in /etc/fstab -install -m 755 misc/scripts/iscsi-umountall $RPM_BUILD_ROOT/sbin -install -m 644 man/iscsi-ls.1 $RPM_BUILD_ROOT/%{_mandir}/man1 -install -m 644 man/iscsid.8 $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 644 man/iscsi.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5 -install -m 644 man/iscsi.bindings.5 $RPM_BUILD_ROOT/%{_mandir}/man5 -install -m 755 misc/scripts/rc.iscsi $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi -install -m 644 misc/iscsi.conf $RPM_BUILD_ROOT/etc -echo 'GenerateName=yes' > initiatorname.iscsi -install -m 600 initiatorname.iscsi $RPM_BUILD_ROOT/etc -rm -f initiatorname.iscsi +mkdir -p $RPM_BUILD_ROOT/var/db/iscsi/ +install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname $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 +install -m 644 etc/iscsid.conf $RPM_BUILD_ROOT/etc %clean rm -rf $RPM_BUILD_ROOT @@ -66,70 +62,12 @@ fi %files %defattr(-,root,root) %config /etc/rc.d/init.d/iscsi -%attr(600,root,root) %config(noreplace) /etc/initiatorname.iscsi -%attr(600,root,root) %config(noreplace) /etc/iscsi.conf -%doc linux-iscsi-%{version}/README +%attr(600,root,root) %config(noreplace) /etc/iscsid.conf +%doc open-iscsi-%{version}/README +%dir /var/db/iscsi /sbin/* %{_mandir}/*/* %changelog -* Mon Jul 19 2004 AJ Lewis 4.0.1.8-0.1 -- update to 4.0.1.8 upstream for 2.6 kernels -- add iscsi-id to binaries installed - -* Wed Jul 14 2004 AJ Lewis 3.6.0.2-0.1 -- update to 3.6.0.2 upstream -- add iscsi-ls to installed binaries -- add iscsi-ls.1 manpage to man1 -- remove /dev/iscsi reference (no longer used) - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Thu Jun 05 2003 Elliot Lee -- rebuilt - -* Mon Feb 03 2003 Michael K. Johnson 3.1.0.3-3 -- rebuild, 3.1.0.3-3 - -* Mon Nov 11 2002 Michael K. Johnson -- Fixed typo in initscript to allow to function - -* Thu Oct 17 2002 Michael K. Johnson -- update to 3.1.0.3 for draft 16 compliance -- /etc/initiatorname.iscsi should be mode 600 -- C++ all gone, no need for libstdc++ static link - -* Wed Aug 14 2002 Bob Matthews -- fix perms on /etc/iscsi.conf - -* Mon Jul 15 2002 Michael K. Johnson -- add status function - -* Thu May 02 2002 Michael K. Johnson -- hack to link statically against libstdc++ so /sbin does not depend on /usr - -* Wed Apr 10 2002 Michael K. Johnson -- update to 2.1.0.20 - -* Fri Oct 26 2001 Than Ngo 2.0.1.8-3 -- cleanup startup script -- add excludearch s390 s390x - -* Tue Aug 28 2001 Michael K. Johnson -- clean up shutdown (#52440) - -* Mon Aug 13 2001 Michael K. Johnson -- update to 2.0.1.8 for draft 6 compliance - -* Mon Aug 13 2001 Bob Matthews -- fix typo in initscripts (#51585) - -* Tue Jul 31 2001 Bill Nottingham -- fix up initscript output (#50502) - -* Wed Jul 25 2001 Jeremy Katz -- source /etc/init.d/functions in the initscript - -* Tue Jul 24 2001 Michael K. Johnson +* Wed Dec 14 2005 Mike Christie - initial packaging diff --git a/sources b/sources index 321baca..6872bdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f1f92c4a040644106f7f0051f78c1f9d linux-iscsi-user-4.0.1.8.tgz +5e047486110c4e5c230b6c3f259d3f1b open-iscsi-5.0.0.4_446.tar.gz