[fcoe-utils] 1.0.20 bump
Petr Sabata
psabata at fedoraproject.org
Thu Jul 7 14:49:15 UTC 2011
commit e3ba57ff1d5c00fed93d1c8a7362c7f50087ac47
Author: Petr Sabata <contyk at redhat.com>
Date: Thu Jul 7 16:48:53 2011 +0200
1.0.20 bump
.gitignore | 1 +
...0.17-init.patch => fcoe-utils-1.0.20-init.patch | 93 +++++++++-----------
fcoe-utils.spec | 25 ++++--
sources | 2 +-
4 files changed, 61 insertions(+), 60 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f24c07e..587081f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ fcoe-utils-*.tar.gz
fcoe-utils-*.rpm
/fcoe-utils-1.0.18.tar.bz2
/fcoe-utils-1.0.19.tar.bz2
+/fcoe-utils-1.0.20.tar.bz2
diff --git a/fcoe-utils-1.0.17-init.patch b/fcoe-utils-1.0.20-init.patch
similarity index 76%
rename from fcoe-utils-1.0.17-init.patch
rename to fcoe-utils-1.0.20-init.patch
index 8ef89b0..8f493c0 100644
--- a/fcoe-utils-1.0.17-init.patch
+++ b/fcoe-utils-1.0.20-init.patch
@@ -1,5 +1,7 @@
---- fcoe-utils-1.0.17/etc/initd/initd.fedora 2011-01-15 01:28:10.000000000 +0100
-+++ fcoe-utils-1.0.17/etc/initd/initd.fedora.new 2011-02-04 10:54:50.152483041 +0100
+diff --git a/etc/initd/initd.fedora b/etc/initd/initd.fedora
+index 5c84e25..f3f3d91 100755
+--- a/etc/initd/initd.fedora
++++ b/etc/initd/initd.fedora
@@ -15,7 +15,7 @@
# this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
@@ -18,9 +20,7 @@
# Default-Stop:
# Short-Description: Open-FCoE Initiator
# Description: Open-FCoE Initiator
---- fcoe-utils-1.0.17/etc/initd/initd.fedora 2011-02-04 11:06:42.251483139 +0100
-+++ fcoe-utils-1.0.17/etc/initd/initd.fedora.new 2011-02-04 11:35:26.779482986 +0100
-@@ -63,6 +63,16 @@
+@@ -63,6 +63,16 @@ test -x $FCOEMON || {
fi
}
@@ -37,51 +37,7 @@
start()
{
echo -n $"Starting FCoE initiator service: "
-@@ -80,22 +90,27 @@
-
- stop()
- {
-- local force=$1
--
-- pid=$(pidof "$FCOEMON")
-- if [ "$force" == "force" ]
-- then
-- action "Destroying any active fcoe interface/s"
-- [ "$pid" ] && kill -HUP $pid
-+ if have_fcoe_root; then
-+ echo $"Possible FCoE root detected, not stopping FCoE."
-+ exit 1
- else
-- [ "$pid" ] && kill -TERM $pid
-- fi
-+ local force=$1
-
-- action $"Stopping FCoE initiator service: "
--
-- rm -f /var/run/fcoemon.*
-- rm -f /tmp/fcoemon.dcbd.*
-- rm -f /var/lock/subsys/fcoe
-+ pid=$(pidof "$FCOEMON")
-+ if [ "$force" == "force" ]
-+ then
-+ action "Destroying any active fcoe interface/s"
-+ [ "$pid" ] && kill -HUP $pid
-+ else
-+ [ "$pid" ] && kill -TERM $pid
-+ fi
-+
-+ action $"Stopping FCoE initiator service: "
-+
-+ rm -f /var/run/fcoemon.*
-+ rm -f /tmp/fcoemon.dcbd.*
-+ rm -f /var/lock/subsys/fcoe
-+ fi
- }
-
- status()
---- fcoe-utils-1.0.17/etc/initd/initd.fedora 2011-02-04 11:52:53.990483140 +0100
-+++ fcoe-utils-1.0.17/etc/initd/initd.fedora.new 2011-02-04 12:46:03.401482934 +0100
-@@ -85,6 +85,34 @@
+@@ -75,26 +85,59 @@ start()
echo
touch /var/lock/subsys/fcoe
@@ -116,3 +72,40 @@
echo
}
+ stop()
+ {
+- local force=$1
+-
+- pid=$(pidof "$FCOEMON")
+- if [ "$force" == "force" ]
+- then
+- action "Destroying any active fcoe interface/s"
+- [ "$pid" ] && kill -HUP $pid
++ if have_fcoe_root; then
++ echo $"Possible FCoE root detected, not stopping FCoE."
++ exit 1
+ else
+- [ "$pid" ] && kill -TERM $pid
+- fi
++ local force=$1
++
++ pid=$(pidof "$FCOEMON")
++ if [ "$force" == "force" ]
++ then
++ action "Destroying any active fcoe interface/s"
++ [ "$pid" ] && kill -HUP $pid
++ else
++ [ "$pid" ] && kill -TERM $pid
++ fi
+
+- action $"Stopping FCoE initiator service: "
++ action $"Stopping FCoE initiator service: "
+
+- rm -f ${PID_FILE}
+- rm -f /var/lock/subsys/fcoe
++ rm -f ${PID_FILE}
++ rm -f /var/lock/subsys/fcoe
++ fi
+ }
+
+ status()
diff --git a/fcoe-utils.spec b/fcoe-utils.spec
index 80578e1..f20a841 100644
--- a/fcoe-utils.spec
+++ b/fcoe-utils.spec
@@ -1,5 +1,5 @@
Name: fcoe-utils
-Version: 1.0.19
+Version: 1.0.20
Release: 1%{?dist}
Summary: Fibre Channel over Ethernet utilities
Group: Applications/System
@@ -9,17 +9,22 @@ URL: http://www.open-fcoe.org
Source0: %{name}-%{version}.tar.bz2
Source1: quickstart.txt
# Generic Fedora patches
-Patch0: fcoe-utils-1.0.17-init.patch
+Patch0: fcoe-utils-1.0.20-init.patch
Patch1: fcoe-utils-1.0.19-make.patch
Patch2: fcoe-utils-1.0.18-help.patch
Patch3: fcoe-utils-1.0.18-config.patch
-BuildRequires: libhbaapi-devel lldpad-devel libnl-devel
-BuildRequires: libtool automake autoconf
-Requires: lldpad libhbalinux >= 1.0.9 iproute device-mapper-multipath
-Requires(post): chkconfig
-Requires(preun): chkconfig initscripts
-Requires(postun): initscripts
+BuildRequires: libtool automake autoconf
+BuildRequires: lldpad-devel >= 0.9.43
+BuildRequires: libhbaapi-devel >= 1.0.12
+BuildRequires: libnl-devel
+Requires: lldpad >= 0.9.43
+Requires: libhbalinux >= 1.0.12
+Requires: iproute
+Requires: device-mapper-multipath
+Requires(post): chkconfig
+Requires(preun): chkconfig initscripts
+Requires(postun): initscripts
%description
Fibre Channel over Ethernet utilities
@@ -28,7 +33,6 @@ fcoemon - service to configure DCB Ethernet QOS filters, works with dcbd or lldp
%prep
%setup -q
-# Fedora patches on top of that...
%patch0 -p1 -b .init
%patch1 -p1 -b .make
%patch2 -p1 -b .help
@@ -101,6 +105,9 @@ fi
%changelog
+* Thu Jul 07 2011 Petr Sabata <contyk at redhat.com> - 1.0.20-1
+- 1.0.20 bump
+
* Thu Jun 02 2011 Petr Sabata <contyk at redhat.com> - 1.0.19-1
- 1.0.19 bump
diff --git a/sources b/sources
index fdd42ba..8b37a56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc1cf6400e442cc906026e4dffa39e55 fcoe-utils-1.0.19.tar.bz2
+d23061aa7e353c5df14cc2429314117b fcoe-utils-1.0.20.tar.bz2
More information about the scm-commits
mailing list