rpms/ivtv-firmware/F-7 ivtv-firmware.spec,1.2,1.3

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/ivtv-firmware/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19056/F-7

Modified Files:
	ivtv-firmware.spec 
Log Message:



Index: ivtv-firmware.spec
===================================================================
RCS file: /cvs/extras/rpms/ivtv-firmware/F-7/ivtv-firmware.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ivtv-firmware.spec	20 Feb 2008 11:12:26 -0000	1.2
+++ ivtv-firmware.spec	13 Mar 2008 19:44:57 -0000	1.3
@@ -1,70 +1,93 @@
-Name:           ivtv-firmware
-Version:        20070217
-Release:        2
-Epoch:          2
-Summary:        Firmware for the PVR 250/350/150/500 model series
-
-Group:          System Environment/Kernel
-License:        Redistributable, no modification permitted
-URL:            http://ivtvdriver.org
-Source0:        http://dl.ivtvdriver.org/ivtv/firmware/firmware-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
-Obsoletes:      ivtv-firmware-audio
-Obsoletes:      %{name}-dec
-Obsoletes:      %{name}-enc
-
+%define version_enc 2.06.039
+%define version_dec 2.02.023
 
+Summary: Firmware for the Hauppauge PVR 250/350/150/500/USB2 model series
+Name: ivtv-firmware
+Version: 20070217
+Release: 17
+Epoch: 2
+License: Redistributable, no modification permitted
+Group: System Environment/Kernel
+URL: http://dl.ivtvdriver.org/ivtv/firmware/
+Source0: http://dl.ivtvdriver.org/ivtv/firmware/firmware-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Obsoletes: ivtv-firmware-audio <= 0.0.1
+Provides: ivtv-firmware-audio = 0.0.1
+Obsoletes: %{name}-dec < %{version_dec}
+Provides: %{name}-dec = %{version_dec}
+Obsoletes: %{name}-enc < %{version_enc}
+Provides: %{name}-enc = %{version_enc}
 
 %description
-This package contains the firmware for WinTV PVR 250/350/150/500 cards.
-
+This package contains the firmware for WinTV Hauppauge PVR
+250/350/150/500/USB2cards.
 
 %prep
 %setup -q -c
 
-
 %build
-# Nothing to build
-
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/lib/firmware
-install -pm 0644 *.{fw,mpg} $RPM_BUILD_ROOT/lib/firmware
-
-# Install the license with the firmware
-for f in license-end-user.txt license-oemihvisv.txt ; do
-mv $f %{name}-$f
-install -pm 0644 %{name}-$f $RPM_BUILD_ROOT/lib/firmware
-ln -s /lib/firmware/%{name}-$f $f
-done
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/lib/firmware
 
+install -p *.fw %{buildroot}/lib/firmware/
+install -p v4l-cx2341x-init.mpg %{buildroot}/lib/firmware/v4l-cx2341x-init.mpg
+# license requires that the licenses go in the same place as the firmware
+for f in license-*.txt
+do
+  install -p $f %{buildroot}/lib/firmware/%{name}-$f
+done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc license-end-user.txt license-oemihvisv.txt
+%doc license-*.txt
 /lib/firmware/*.fw
-/lib/firmware/*.mpg
-/lib/firmware/%{name}-*.txt
+/lib/firmware/v4l-cx2341x-init.mpg
+/lib/firmware/%{name}-license-*.txt
 
 %changelog
-* Tue Feb 19 2008 kwizart < kwizart at gmail.com > - 20070217-2
-- Install the license with the firmware.
+* Wed Mar  5 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 2:20070217-17
+- Many fixes by Jarod Wilson.
+- Rip out legacy support.
+
+* Sat Feb  2 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 2:20070217-16
+- Place licenses next to firmware images.
+
+* Sat Dec 22 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 2:20070217-15.1
+- Own directories from legacy paths.
+
+* Wed Oct 24 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 2:20070217-15
+- Add v4l-cx2341x-init.mpg as a pseudo-firmware.
+
+* Wed Feb 28 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 2:20070217-13
+- Modify versioning to follow date.
+
+* Mon May 29 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update firmwares to recommended versions.
+- Merge in audio firmware.
+
+* Tue Jan  4 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Initial build for audio firmware.
+
+* Thu Oct 28 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update firmware to 1.8a.
+- split package into enc/dec firmwares.
+- version acording to origin, note that the two firmwares have
+  different versions, so none is really suitable for the main package.
 
-* Mon Oct 22 2007 kwizart < kwizart at gmail.com > - 20070217-1
-- Move firmware date to version.
-- Change description.
-- Add Obsoletes.
+* Wed Mar  3 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Change versioning (previous was based on Windows driver).
+- need to bump epoch for that :(
 
-* Mon Oct 22 2007 kwizart < kwizart at gmail.com > - 0-2.20070217
-- Add ivtv licenses into /lib/firmware
+* Sat Feb 28 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 1.8 (22035).
 
-* Mon Oct 22 2007 kwizart < kwizart at gmail.com > - 0-1.20070217
-- Initial package (inspired from ATrpms).
+* Mon Dec 29 2003 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Initial build.