packages: iscsitarget/iscsitarget.spec, iscsitarget/2.6.31.patch (REMOVED), ...

[arekm]

Author: arekm                        Date: Thu Dec  9 20:38:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.4.20.2

---- Files affected:
packages/iscsitarget:
   iscsitarget.spec (1.24 -> 1.25) , 2.6.31.patch (1.1 -> NONE)  (REMOVED), 2.6.33.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/iscsitarget/iscsitarget.spec
diff -u packages/iscsitarget/iscsitarget.spec:1.24 packages/iscsitarget/iscsitarget.spec:1.25
--- packages/iscsitarget/iscsitarget.spec:1.24	Tue Apr  6 15:24:22 2010
+++ packages/iscsitarget/iscsitarget.spec	Thu Dec  9 21:38:19 2010
@@ -6,20 +6,18 @@
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
 #
-%define		_rel 2
+%define		_rel 1
 Summary:	iSCSI target - SCSI over IP
 Summary(pl.UTF-8):	iSCSI target - SCSI po IP
 Name:		iscsitarget
-Version:	1.4.19
+Version:	1.4.20.2
 Release:	%{_rel}
 License:	GPL
 Group:		Base/Kernel
 Source0:	http://dl.sourceforge.net/iscsitarget/%{name}-%{version}.tar.gz
-# Source0-md5:	9beca214c28949cce1716b49fec57de4
+# Source0-md5:	2f23c0bfe124d79f5c20e34ef2aaff82
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
-Patch0:		2.6.31.patch
-Patch1:		2.6.33.patch
 URL:		http://iscsitarget.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	openssl-devel
@@ -60,8 +58,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %if %{with kernel}
@@ -71,7 +67,7 @@
 %if %{with userspace}
 %{__make} -C usr \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -fno-inline -Wall -I../include -D_GNU_SOURCE"
+	CFLAGS="%{rpmcflags} %{rpmcppflags} -fno-inline -Wall -I../include -D_GNU_SOURCE"
 %endif
 
 %install
@@ -134,6 +130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2010/12/09 20:38:19  arekm
+- up to 1.4.20.2
+
 Revision 1.24  2010/04/06 13:24:22  zbyniu
 - patch for kernels 2.6.33; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iscsitarget/iscsitarget.spec?r1=1.24&r2=1.25&f=u