- rel 2, moved firmware images to /lib/firmware, added description

  to source1 text file, removed one firmware image included in
  the linux-firmware package.

diff --git a/dvb-firmwares.spec b/dvb-firmwares.spec
index eb25a5879b5d92048a7d106975e7ebdb04662644..573a85e9e9e8e9ecc2903905611f686c429a2552 100644 (file)
--- a/dvb-firmwares.spec
+++ b/dvb-firmwares.spec
@@ -1,20 +1,26 @@
+# TODO
+#      resolve cx88 conflicts with linux-firmware
+#
 Summary:       Firmware files used by DVB modules
 Summary(pl.UTF-8):     Pliki firmware'u używane przez sterowniki DVB
 Name:          dvb-firmwares
 Version:       20110802
-Release:       1
+Release:       2
 License:       Redistributable
 Group:         Base/Kernel
 Source0:       http://linuxtv.org/downloads/firmware/%{name}-%{version}.tar.bz2
 # Source0-md5: 330e19f9444a03f5338bab590ab9d728
 Source1:       %{name}-%{version}.txt
+# dvb-firmwares-20110802.txt - text version of index.php from the URL
+# below. Includes copyright information and distribution conditions
+# of the firmware images.
 URL:           http://linuxtv.org/downloads/firmware/
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-This package includes firmware files required for the following 
-TV/DVB equipment:
+This package includes firmware files required for the following TV/DVB
+equipment:
 - OREN demodulators
 - various USB devices
   - Twinhan USB-T VP-7045/VP-7046 (MagicBoxII)
@@ -31,7 +37,7 @@ TV/DVB equipment:
 - Terratec devices
 
 %description -l pl.UTF-8
-Ten pakiet zawiera pliki firmware'u wymagane do działania 
+Ten pakiet zawiera pliki firmware'u wymagane do działania
 następujących urządzeń TV/DVB:
 - demodulatory OREN
 - różne urządzenia USB
@@ -56,9 +62,11 @@ następujących urządzeń TV/DVB:
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/firmware/dvb
-%{__cp} -a . $RPM_BUILD_ROOT/lib/firmware/dvb
-%{__rm} $RPM_BUILD_ROOT/lib/firmware/dvb/README
+install -d $RPM_BUILD_ROOT/lib/firmware
+%{__cp} -a . $RPM_BUILD_ROOT/lib/firmware
+%{__rm} $RPM_BUILD_ROOT/lib/firmware/README
+# v4l-cx231xx-avcore-01.fw is included in linux-firmware-20130201-1.noarch
+%{__rm} $RPM_BUILD_ROOT/lib/firmware/v4l-cx231xx-avcore-01.fw
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,5 +74,4 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README
-%dir /lib/firmware/dvb
-/lib/firmware/dvb/*
+/lib/firmware/*