[bfa-firmware/f17] update to 3.0.3.1

[Tom Callaway]

commit 64e33fa57dd77f3e65657f2802fd14f2ddc767dc
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Sep 6 10:13:56 2012 -0400

    update to 3.0.3.1

 bfa-firmware.spec |   48 +++++++++++++++++++++++++++++++++++++++++++++---
 sources           |    1 +
 2 files changed, 46 insertions(+), 3 deletions(-)
---
diff --git a/bfa-firmware.spec b/bfa-firmware.spec
index f681f56..584a821 100644
--- a/bfa-firmware.spec
+++ b/bfa-firmware.spec
@@ -1,13 +1,15 @@
 Name:		bfa-firmware
 Summary:	Brocade Fibre Channel HBA Firmware
-Version:	3.0.0.0
-Release:	2%{?dist}
+Version:	3.0.3.1
+Release:	1%{?dist}
 License:	Redistributable, no modification permitted
 Group:		System Environment/Kernel
 # These files were taken from:
 # http://www.brocade.com/sites/dotcom/services-support/drivers-downloads/CNA/Linux.page
 # No direct link is available.
 Source0:	bfa_firmware_linux-%{version}-0.tgz
+# We need to keep the old 3.0.0.0 firmware around for RHEL builds
+Source1:	bfa_firmware_linux-3.0.0.0-0.tgz
 Source3:	LICENSE
 URL:		http://www.brocade.com/sites/dotcom/services-support/drivers-downloads/CNA/Linux.page
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,8 +21,21 @@ Requires:	udev
 Brocade Fibre Channel HBA Firmware.
 
 %prep
-%setup -n 3.0_GA_firwmare_image -q
+%setup -c -n %{name}-%{version} -q
 cp %{SOURCE3} .
+# RHEL needs to also have the old 3.0.0.0 firmware present, to ensure
+# compatibility for the pre-6.4 kernels. These firmware files are not versioned.
+# When the upstream driver change to use a versioned firmware lands in Fedora
+# we will need to apply the renaming changes universally.
+%if 0%{?rhel}
+# Rename the new files to embed version in the way that the RHEL 6.4 driver
+# is expecting.
+mv cbfw.bin cbfw-%{version}.bin
+mv ct2fw.bin ct2fw-%{version}.bin
+mv ctfw.bin ctfw-%{version}.bin
+# Unpack the old source into 3.0_GA_firwmare_image/
+tar xvf %{SOURCE1}
+%endif
 
 %build
 # Firmware, do nothing.
@@ -28,7 +43,20 @@ cp %{SOURCE3} .
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/lib/firmware/
+
+%if 0%{?rhel}
+install -m0644 cbfw-%{version}.bin ct2fw-%{version}.bin ctfw-%{version}.bin %{buildroot}/lib/firmware/
+pushd 3.0_GA_firwmare_image
+install -m0644 cbfw.bin ct2fw.bin ctfw.bin %{buildroot}/lib/firmware/
+popd
+pushd %{buildroot}/lib/firmware/
+ln -s cbfw.bin cbfw-3.0.0.0.bin
+ln -s ct2fw.bin ct2fw-3.0.0.0.bin
+ln -s ctfw.bin ctfw-3.0.0.0.bin
+popd
+%else
 install -m0644 cbfw.bin ct2fw.bin ctfw.bin %{buildroot}/lib/firmware/
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -36,11 +64,25 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
+%if 0%{?rhel}
+/lib/firmware/cbfw-%{version}.bin
+/lib/firmware/ctfw-%{version}.bin
+/lib/firmware/ct2fw-%{version}.bin
+/lib/firmware/cbfw-3.0.0.0.bin
+/lib/firmware/ctfw-3.0.0.0.bin
+/lib/firmware/ct2fw-3.0.0.0.bin
+%endif
 /lib/firmware/cbfw.bin
 /lib/firmware/ctfw.bin
 /lib/firmware/ct2fw.bin
 
 %changelog
+* Thu Sep  6 2012 Tom Callaway <spot at fedoraproject.org> 3.0.3.1-1
+- update to 3.0.3.1
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 56e8a24..e48eec7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+708d4ca63e9fb9d7d951d5d382fbd362  bfa_firmware_linux-3.0.3.1-0.tgz
 f76ddb414a67f70c60a7d9aea92a4d2f  bfa_firmware_linux-3.0.0.0-0.tgz