rpms/scsi-target-utils/devel scsi-target-utils-dynamic-link-iser.patch, 1.1, 1.2 scsi-target-utils.spec, 1.15, 1.16

[terjeros]

Author: terjeros

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

Modified Files:
	scsi-target-utils-dynamic-link-iser.patch 
	scsi-target-utils.spec 
Log Message:
* Sun Feb 14 2010 Terje Rosten <terje.rosten at ntnu.no> - 1.0.1-2
- Update iser patch to build with new link rules
- Fix optflags


scsi-target-utils-dynamic-link-iser.patch:
 Makefile           |    7 -
 iscsi/iscsi_rdma.c |  214 +++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 195 insertions(+), 26 deletions(-)

Index: scsi-target-utils-dynamic-link-iser.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/scsi-target-utils-dynamic-link-iser.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scsi-target-utils-dynamic-link-iser.patch	22 Dec 2009 11:12:21 -0000	1.1
+++ scsi-target-utils-dynamic-link-iser.patch	14 Feb 2010 22:43:08 -0000	1.2
@@ -1,8 +1,8 @@
 diff --git a/usr/Makefile b/usr/Makefile
-index 2dcae2a..78be3e1 100644
+index 2dcae2a..fc88d47 100644
 --- a/usr/Makefile
 +++ b/usr/Makefile
-@@ -17,12 +17,13 @@ TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o \
+@@ -17,10 +17,11 @@ TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o \
  		isns.o)
  TGTD_OBJS += bs_rdwr.o bs_aio.o
  
@@ -11,13 +11,12 @@ index 2dcae2a..78be3e1 100644
 +ifneq ($(findstring verbs.h,$(wildcard /usr/include/infiniband/*.h)), )
 +ifneq ($(findstring rdma_cma.h,$(wildcard /usr/include/rdma/*.h)), )
  TGTD_OBJS += iscsi/iscsi_rdma.o
- LIBS += -libverbs -lrdmacm
+-LIBS += -libverbs -lrdmacm
++LIBS += -libverbs -lrdmacm -ldl
++endif
  endif
  endif
-+endif
  
- ifneq ($(FCP),)
- CFLAGS += -DFCP -DUSE_KERNEL
 diff --git a/usr/iscsi/iscsi_rdma.c b/usr/iscsi/iscsi_rdma.c
 index 6cf5677..72e4eaf 100644
 --- a/usr/iscsi/iscsi_rdma.c


Index: scsi-target-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/scsi-target-utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- scsi-target-utils.spec	24 Jan 2010 22:53:38 -0000	1.15
+++ scsi-target-utils.spec	14 Feb 2010 22:43:08 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           scsi-target-utils
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The SCSI target daemon and utility programs
 
 Group:          System Environment/Daemons
@@ -35,7 +35,7 @@ Currently, software iSCSI targets are su
 
 %build
 pushd usr
-%{__sed} -i -e 's|-Wall -g -O2|%{optflags}|' Makefile
+%{__sed} -i -e 's|-g -O2 -Wall|%{optflags}|' Makefile
 %{__make} %{?_smp_mflags} ISCSI=1 ISCSI_RDMA=1
 popd
 
@@ -95,6 +95,10 @@ fi
 
 
 %changelog
+* Sun Feb 14 2010 Terje Rosten <terje.rosten at ntnu.no> - 1.0.1-2
+- Update iser patch to build with new link rules
+- Fix optflags
+
 * Sun Jan 24 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> - 1.0.1-1
 - Update to new upstream release
 - Upstream moved to Sourceforge