From 80a8eaad404fd2ca2c5e971c20e0b8b00cd21a1f Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@fedoraproject.org>
Date: Mon, 12 Apr 2010 12:26:23 +0000
Subject: [PATCH] new upstream version, some bugfixes, new FCoE related scripts

---
 .cvsignore                  |  2 +-
 fcoe-utils-1.0.7-init.patch |  6 +++---
 fcoe-utils.spec             | 19 +++++++++++++++----
 sources                     |  2 +-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 333f6cd..a40dcf6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fcoe-utils-1.0.12.tar.gz
+fcoe-utils-1.0.13.tar.gz
diff --git a/fcoe-utils-1.0.7-init.patch b/fcoe-utils-1.0.7-init.patch
index 14cb39c..ac4199c 100644
--- a/fcoe-utils-1.0.7-init.patch
+++ b/fcoe-utils-1.0.7-init.patch
@@ -30,11 +30,11 @@
  	echo
  }
  
-@@ -80,6 +86,7 @@ service_stop()
+@@ -89,6 +95,7 @@ service_stop()
  
  	rm -f /var/run/fcoemon.*
  	rm -f /tmp/fcoemon.dcbd.*
 +	rm -f /var/lock/subsys/fcoe
- 
- 	echo
  }
+ 
+ status()
diff --git a/fcoe-utils.spec b/fcoe-utils.spec
index 837f2e1..1dd3d21 100644
--- a/fcoe-utils.spec
+++ b/fcoe-utils.spec
@@ -1,6 +1,6 @@
 Name:           fcoe-utils
-Version:        1.0.12
-Release:        2.20100323git%{?dist}
+Version:        1.0.13
+Release:        1%{?dist}
 Summary:        Fibre Channel over Ethernet utilities
 
 Group:          Applications/System
@@ -13,7 +13,6 @@ URL:            http://www.open-fcoe.org
 # cd .. && gzip fcoe-utils-%{version}
 Source0:        %{name}-%{version}.tar.gz
 Source1:        quickstart.txt
-Source2:        fcoe_edd.sh
 Patch0:         fcoe-utils-1.0.7-init.patch
 Patch1:         fcoe-utils-1.0.7-init-condrestart.patch
 Patch2:         fcoe-utils-1.0.8-includes.patch
@@ -57,7 +56,12 @@ install -m 644 %SOURCE1 quickstart.txt
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/fcoe/
 cp etc/config $RPM_BUILD_ROOT%{_sysconfdir}/fcoe/config
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/fcoe
-install -m 755 %SOURCE2 $RPM_BUILD_ROOT%{_libexecdir}/fcoe/fcoe_edd.sh
+
+install -m 755 contrib/fcc.sh $RPM_BUILD_ROOT%{_libexecdir}/fcoe/fcc.sh
+install -m 755 contrib/fcoe_edd.sh $RPM_BUILD_ROOT%{_libexecdir}/fcoe/fcoe_edd.sh
+install -m 755 contrib/fcoe-setup.sh $RPM_BUILD_ROOT%{_libexecdir}/fcoe/fcoe-setup.sh
+install -m 755 debug/fcoedump.sh $RPM_BUILD_ROOT%{_libexecdir}/fcoe/fcoedump.sh
+install -m 755 debug/dcbcheck.sh $RPM_BUILD_ROOT%{_libexecdir}/fcoe/dcbcheck.sh
 
 
 %clean
@@ -102,9 +106,16 @@ fi
 %config(noreplace) %{_sysconfdir}/fcoe/cfg-ethx
 %{_initrddir}/fcoe
 %attr(0755,root,root) %{_libexecdir}/fcoe/fcoe_edd.sh
+%attr(0755,root,root) %{_libexecdir}/fcoe/fcoe-setup.sh
+%attr(0755,root,root) %{_libexecdir}/fcoe/fcc.sh
+%attr(0755,root,root) %{_libexecdir}/fcoe/fcoedump.sh
+%attr(0755,root,root) %{_libexecdir}/fcoe/dcbcheck.sh
 
 
 %changelog
+* Mon Apr 12 2010 Jan Zeleny <jzeleny@redhat.com> - 1.0.13-1
+- rebased to v1.0.13, some bugfixes, new fcoe related scripts
+
 * Tue Mar 30 2010 Jan Zeleny <jzeleny@redhat.com> - 1.0.12-2.20100323git
 - some upstream updates
 - better fipvlan support
diff --git a/sources b/sources
index c1689a3..3093703 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1a195ff5178175c84ebe6e3a9e97e7b  fcoe-utils-1.0.12.tar.gz
+ccb0dc1d3f7cc612cae5eb2ed4fbd941  fcoe-utils-1.0.13.tar.gz