SPECS: linux-iscsi.spec - up to 5.0.0.0.3rc6

[arekm]

Author: arekm                        Date: Wed Jun 22 16:16:08 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 5.0.0.0.3rc6

---- Files affected:
SPECS:
   linux-iscsi.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: SPECS/linux-iscsi.spec
diff -u SPECS/linux-iscsi.spec:1.28 SPECS/linux-iscsi.spec:1.29
--- SPECS/linux-iscsi.spec:1.28	Thu Jun  2 21:27:10 2005
+++ SPECS/linux-iscsi.spec	Wed Jun 22 18:16:02 2005
@@ -12,13 +12,14 @@
 Summary:	iSCSI - SCSI over IP
 Summary(pl):	iSCSI - SCSI po IP
 Name:		linux-iscsi
-Version:	5.0.0.2
+Version:	5.0.0.0.3
+%define		_rc  rc6-363
 %define		_rel 0.1
 Release:	%{_rel}
 License:	GPL
 Group:		Base/Kernel
-Source0:	http://dl.sourceforge.net/linux-iscsi/%{name}-%{version}.tar.gz
-# Source0-md5:	2d29f3c35554e3ea0abf46de39e6b215
+Source0:	http://dl.sourceforge.net/linux-iscsi/%{name}-%{version}%{_rc}.tar.gz
+# Source0-md5:	3df59acaf3e9d3011e417873417eb0bf
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 URL:		http://linux-iscsi.sourceforge.net/
@@ -71,11 +72,13 @@
 Moduł jądra SMP dla protokołu IP over SCSI.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_rc}
 
 %build
 %if %{with kernel}
 cd kernel
+patch < backward-compile-2.6.11.patch
+
 # kernel module(s)
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
@@ -96,8 +99,8 @@
 		CC="%{__cc}" \
 		M=$PWD O=$PWD \
 		%{?with_verbose:V=1}
-	mv iscsi_if{,-$cfg}.ko
 	mv iscsi_tcp{,-$cfg}.ko
+	mv scsi_transport_iscsi{,-$cfg}.ko
 done
 cd ..
 %endif
@@ -105,7 +108,7 @@
 %if %{with userspace}
 %{__make} -C usr \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -I../include -DNETLINK_ISCSI=10"
+	CFLAGS="%{rpmcflags} -I../include -DLinux -DNETLINK_ISCSI=10"
 %endif
 
 %install
@@ -115,16 +118,16 @@
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
-install kernel/iscsi_if-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/iscsi_if.ko
 install kernel/iscsi_tcp-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/iscsi_tcp.ko
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/iscsi_tcp.ko
+install kernel/scsi_transport_iscsi-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/scsi_transport_iscsi.ko
 
 %if %{with smp} && %{with dist_kernel}
-install kernel/iscsi_if-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/iscsi_if.ko
 install kernel/iscsi_tcp-smp.ko \
-        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/iscsi_tcp.ko
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/iscsi_tcp.ko
+install kernel/scsi_transport_iscsi-smp.ko \
+        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/scsi_transport_iscsi.ko
 %endif
 %endif
 
@@ -203,6 +206,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2005/06/22 16:16:02  arekm
+- up to 5.0.0.0.3rc6
+
 Revision 1.28  2005/06/02 19:27:10  qboosh
 - sorted verify() flags
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/linux-iscsi.spec?r1=1.28&r2=1.29&f=u