From 1447cbc1c848ca036a542e11101353a18065fd46 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com>
Date: Tue, 16 Jun 2015 17:24:41 -0700
Subject: [PATCH] rebase to upstream v1.0.30-2-g91c0c8c

---
 fcoe-utils.spec | 20 +++++++++++---------
 sources         |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/fcoe-utils.spec b/fcoe-utils.spec
index 499d696..a940ff0 100644
--- a/fcoe-utils.spec
+++ b/fcoe-utils.spec
@@ -1,11 +1,11 @@
 # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags
 %global _hardened_build 1
 
-%global checkout 9267509
+%global checkout 91c0c8c
 
 Name:               fcoe-utils
-Version:            1.0.29
-Release:            7.git%{checkout}%{?dist}
+Version:            1.0.30
+Release:            1.git%{checkout}%{?dist}
 Summary:            Fibre Channel over Ethernet utilities
 Group:              Applications/System
 License:            GPLv2
@@ -16,12 +16,13 @@ Source1:            quickstart.txt
 Source2:            fcoe.service
 Source3:            fcoe.config
 ExcludeArch:        ppc s390 s390x
-Patch1:             fcoe-utils-1.0.29-29-g9267509.patch
-Patch2:             fcoe-utils-1.0.29-pass-flags-to-fcoemon-to-enable-vn2vn-mode.patch
+Patch1:             fcoe-utils-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch
+Patch2:             fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch
+Patch3:             fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch
 BuildRequires:      autoconf
 BuildRequires:      automake
 BuildRequires:      libhbaapi-devel >= 2.2.9-6
-BuildRequires:      libhbalinux-devel >= 1.0.16-5
+BuildRequires:      libhbalinux-devel >= 1.0.17-1
 BuildRequires:      libtool
 BuildRequires:      lldpad-devel >= 0.9.43
 BuildRequires:      systemd
@@ -39,10 +40,8 @@ fcoeadm - command line tool for configuring FCoE interfaces
 fcoemon - service to configure DCB Ethernet QOS filters, works with lldpad
 
 %prep
-%setup -q
+%autosetup -p1
 cp -v %{SOURCE1} quickstart.txt
-%patch1 -p1 -b .v1_0_29-29
-%patch2 -p1 -b .vn2vn
 
 %build
 ./bootstrap.sh
@@ -86,6 +85,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config
 %{_libexecdir}/fcoe/
 
 %changelog
+* Tue Jun 16 2015 Chris Leech <cleech@redhat.com> - 1.0.30-1
+- rebase to upstream v1.0.30-2-g91c0c8c
+
 * Fri Oct 24 2014 Chris Leech <cleech@redhat.com> - 1.0.29-7
 - enable vn2vn mode in fcoeadm
 
diff --git a/sources b/sources
index 90f84cb..a15b7e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-473f7dc7ba6a7bbbb2515f6a08573869  fcoe-utils-1.0.29.tar.gz
+6fcbb0e06a2af0bc1f2f5453d1042eaf  fcoe-utils-1.0.30.tar.gz