jwboyer pushed to linux-firmware (master). "Fix conflict with ivtv-firmware (rhbz 1203385)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 14 14:51:49 UTC 2015
>From 7b987814c9ced5ef6cdfa909c692ece9c484bdb9 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 5453a65..ed3bfee 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,5 +1,5 @@
%global checkout ec89525b
-%global firmware_release 48
+%global firmware_release 49
%global _firmwarepath /usr/lib/firmware
@@ -256,6 +256,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
@@ -406,6 +408,9 @@ rm -rf $RPM_BUILD_ROOT
%doc WHENCE LICENCE.* LICENSE.*
%changelog
+* Tue Apr 14 2015 Josh Boyer <jwboyer at fedoraproject.org> 20150415-49.gitec89525b
+- Fix conflict with ivtv-firmware (rhbz 1203385)
+
* Fri Apr 10 2015 Josh Boyer <jwboyer at fedoraproject.org> 20150415-47.gitec89525b
- Update to the latest upstream git snapshot
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/linux-firmware.git/commit/?h=master&id=7b987814c9ced5ef6cdfa909c692ece9c484bdb9
More information about the scm-commits
mailing list