jwboyer pushed to linux-firmware (f21). "Fix conflict with ivtv-firmware (rhbz 1203385)"

[notifications at fedoraproject.org]

>From ef335d015c3959932bdd5b1fade970f9d10e6a04 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer at redhat.com>
Date: Tue, 14 Apr 2015 10:47:27 -0400
Subject: Fix conflict with ivtv-firmware (rhbz 1203385)


diff --git a/linux-firmware.spec b/linux-firmware.spec
index d5ed01b..8a7068e 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,5 +1,5 @@
 %global checkout ec89525b
-%global firmware_release 46
+%global firmware_release 47
 
 %global _firmwarepath	/usr/lib/firmware
 
@@ -254,6 +254,8 @@ git commit -m init .
 # Remove firmware shipped in separate packages already
 # Perhaps these should be built as subpackages of linux-firmware?
 rm -rf ess korg sb16 yamaha
+# And the conexant firmware shipped in ivtv-firmware
+rm v4l-cx25840.fw
 
 # Remove source files we don't need to install
 rm -f usbdux/*dux */*.asm
@@ -404,6 +406,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc WHENCE LICENCE.* LICENSE.*
 
 %changelog
+* Tue Apr 14 2015 Josh Boyer <jwboyer at fedoraproject.org> 20150415-47.gitec89525b
+- Fix conflict with ivtv-firmware (rhbz 1203385)
+
 * Fri Apr 10 2015 Josh Boyer <jwboyer at fedoraproject.org> 20150415-46.gitec89525b
 - Update to the latest upstream git snapshot
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/linux-firmware.git/commit/?h=f21&id=ef335d015c3959932bdd5b1fade970f9d10e6a04