rpms/fcoe-utils/devel fcoe-utils-1.0.8-includes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 fcoe-utils-1.0.7-init-condrestart.patch, 1.1, 1.2 fcoe-utils-1.0.7-init.patch, 1.2, 1.3 fcoe-utils.spec, 1.6, 1.7 sources, 1.2, 1.3 fcoe-utils-1.0.7-free.patch, 1.1, NONE fcoe-utils-1.0.7-longOpts.patch, 1.1, NONE

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/fcoe-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1674

Modified Files:
	.cvsignore fcoe-utils-1.0.7-init-condrestart.patch 
	fcoe-utils-1.0.7-init.patch fcoe-utils.spec sources 
Added Files:
	fcoe-utils-1.0.8-includes.patch 
Removed Files:
	fcoe-utils-1.0.7-free.patch fcoe-utils-1.0.7-longOpts.patch 
Log Message:
Added patch to compile cleanly and without upstream's ugly hack


fcoe-utils-1.0.8-includes.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fcoe-utils-1.0.8-includes.patch ---
--- fcoe-utils-1.0.8/Makefile.am.orig	2009-07-31 13:28:11.484799253 +0200
+++ fcoe-utils-1.0.8/Makefile.am	2009-07-31 13:28:38.331800646 +0200
@@ -5,7 +5,7 @@
 endif
 
 ## all targets should look for headers in the include directory
-AM_CPPFLAGS = -I${srcdir}/include
+AM_CPPFLAGS = -I${srcdir}/include -I/lib/modules/`rpm -q --list kernel | grep "^/lib/modules/.*/build$$" | cut -f4 -d"/" | sort -r | head -1`/build/include
 
 ## pass the sysconfdir into the C proprocessor
 AM_CFLAGS = -DSYSCONFDIR="\"${sysconfdir}\""


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Apr 2009 07:34:34 -0000	1.2
+++ .cvsignore	31 Jul 2009 17:51:09 -0000	1.3
@@ -1 +1 @@
-fcoe-utils-1.0.7.tar.gz
+fcoe-utils-1.0.8.tar.gz

fcoe-utils-1.0.7-init-condrestart.patch:
 initd.fedora |    3 +++
 1 file changed, 3 insertions(+)

Index: fcoe-utils-1.0.7-init-condrestart.patch
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/fcoe-utils-1.0.7-init-condrestart.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fcoe-utils-1.0.7-init-condrestart.patch	14 May 2009 14:17:13 -0000	1.1
+++ fcoe-utils-1.0.7-init-condrestart.patch	31 Jul 2009 17:51:10 -0000	1.2
@@ -1,7 +1,7 @@
 --- fcoe-utils-1.0.7/etc/initd/initd.fedora	2009-03-27 21:40:22.000000000 +0100
 +++ fcoe-utils-1.0.7/etc/initd/initd.fedora.update	2009-04-03 09:54:39.000000000 +0200
  service_status()
-@@ -243,6 +243,8 @@ service_status()
+@@ -245,6 +245,8 @@ service_status()
  	else
  		echo "Created interfaces: $IF_LIST"
  	fi
@@ -10,7 +10,7 @@
  }
  
  case "$1" in
-@@ -282,6 +284,7 @@ case "$1" in
+@@ -284,6 +286,7 @@ case "$1" in
  		;;
  	status)
  		service_status

fcoe-utils-1.0.7-init.patch:
 initd.fedora |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Index: fcoe-utils-1.0.7-init.patch
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/fcoe-utils-1.0.7-init.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fcoe-utils-1.0.7-init.patch	14 May 2009 14:17:13 -0000	1.2
+++ fcoe-utils-1.0.7-init.patch	31 Jul 2009 17:51:10 -0000	1.3
@@ -20,8 +20,8 @@
  # Description: Open-FCoE SAN Setup
  ### END INIT INFO
  
-@@ -183,6 +186,9 @@ service_start()
- 	    daemon --pidfile ${PID_FILE} ${FCOEMON}
+@@ -185,6 +187,9 @@ service_start()
+ 	    daemon --pidfile ${PID_FILE} ${FCOEMON} ${FCOEMON_OPTS}
  	fi
  
 +  echo 
@@ -30,7 +30,7 @@
  	return
  }
  
-@@ -218,6 +224,7 @@ service_stop()
+@@ -220,6 +226,7 @@ service_stop()
  	done
  	rm -f /var/run/fcoemon.*
  	rm -f /tmp/fcoemon.dcbd.*


Index: fcoe-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/fcoe-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fcoe-utils.spec	24 Jul 2009 22:34:01 -0000	1.6
+++ fcoe-utils.spec	31 Jul 2009 17:51:10 -0000	1.7
@@ -1,21 +1,25 @@
 Name:           fcoe-utils
-Version:        1.0.7
-Release:        8%{?dist}
+Version:        1.0.8
+Release:        2%{?dist}
 Summary:        Fibre Channel over Ethernet utilities
 
 Group:          Applications/System
 License:        GPLv2
 URL:            http://www.open-fcoe.org
-Source0:        http://www.open-fcoe.org/openfc/downloads/%{name}-%{version}.tar.gz
+# This source was pulled from upstream git repository
+# To make a tarball, just run:
+# git clone git://open-fcoe.org/openfc/fcoe-utils.git && cd fcoe-utils
+# git archive --prefix=fcoe-utils-%{version}/ v%{version} > ../fcoe-utils-%{version}.tar
+# cd .. && gzip fcoe-utils-%{version}
+Source0:        %{name}-%{version}.tar.gz
 Source1:        quickstart.txt
 Patch0:         fcoe-utils-1.0.7-init.patch
-Patch1:         fcoe-utils-1.0.7-free.patch
-Patch2:         fcoe-utils-1.0.7-init-condrestart.patch
-Patch3:         fcoe-utils-1.0.7-longOpts.patch
+Patch1:         fcoe-utils-1.0.7-init-condrestart.patch
+Patch2:         fcoe-utils-1.0.8-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libhbaapi-devel dcbd-devel
-Requires:         dcbd libhbalinux
+BuildRequires:    libhbaapi-devel dcbd-devel libtool automake kernel-devel
+Requires:         dcbd libhbalinux >= 1.0.8
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
 Requires(postun): initscripts
@@ -28,12 +32,11 @@ fcoemon - service to configure DCB Ether
 %prep
 %setup -q
 %patch0 -p1 -b .initPatch
-%patch1 -p1 -b .freePatch
-%patch2 -p1 -b .condrestartPatch
-%patch3 -p1 -b .longOpts
-
+%patch1 -p1 -b .condrestartPatch
+%patch2 -p1 -b .includes-fix
 
 %build
+./bootstrap.sh
 %configure
 make %{?_smp_mflags}
 
@@ -93,6 +96,12 @@ fi
 
 
 %changelog
+* Fri Jul 31 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.8-2
+- patch for clean compilation without usage of upstream's ugly hack
+
+* Thu Jul 30 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.8-1
+- rebase of fcoe-utils to 1.0.8, adjusted spec file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Apr 2009 07:34:34 -0000	1.2
+++ sources	31 Jul 2009 17:51:10 -0000	1.3
@@ -1 +1 @@
-66dc5a5605719875d5434d7dbb9f6d88  fcoe-utils-1.0.7.tar.gz
+0f8ddd3e4a5d75dc9568fe7141364894  fcoe-utils-1.0.8.tar.gz


--- fcoe-utils-1.0.7-free.patch DELETED ---


--- fcoe-utils-1.0.7-longOpts.patch DELETED ---