SPECS: speedtouch-firmware.spec - let package support revisions 0, ...

[qboosh]

Author: qboosh                       Date: Tue Nov 29 21:39:31 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- let package support revisions 0,2,4 instead of only 4
- include mgmt.o actually _working_ with modem_run
- no need to hide firmware from users

---- Files affected:
SPECS:
   speedtouch-firmware.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/speedtouch-firmware.spec
diff -u SPECS/speedtouch-firmware.spec:1.5 SPECS/speedtouch-firmware.spec:1.6
--- SPECS/speedtouch-firmware.spec:1.5	Tue Nov 29 22:14:04 2005
+++ SPECS/speedtouch-firmware.spec	Tue Nov 29 22:39:25 2005
@@ -8,9 +8,12 @@
 Group:		Libraries
 Source0:	http://www.speedtouch.com/download/drivers/USB/SpeedTouch330_firmware_3012.zip
 # NoSource0-md5:	2551ce46ef785642f2c6768511f70ff3
-Source1:	http://www.linux-usb.org/SpeedTouch/firmware/firmware-extractor.tar.gz
-# Source1-md5:	752e33faf0b62176114e757dfc1e7191
+Source1:	http://download.ethomson.com/download/speedmgmt.tar.gz
+# NoSource1-md5:	102dc7a457c3942ee21dc834db68eac2
+Source2:	http://www.linux-usb.org/SpeedTouch/firmware/firmware-extractor.tar.gz
+# Source2-md5:	752e33faf0b62176114e757dfc1e7191
 NoSource:	0
+NoSource:	1
 URL:		http://www.speedtouchdsl.com/
 BuildRequires:	unzip
 Requires:	speedtouch >= 1.2-1
@@ -38,37 +41,39 @@
 w przestrzeni użytkownika).
 
 %prep
-%setup -q -c -a1
+%setup -q -c -a1 -a2
 
 %build
 %{__cc} %{rpmcflags} -o fextractor firmware-extractor/firmware.c
 
 # for a silver (revision 4) modem
-revision=4
 cp -f ZZZL_%{version} mgmt.o
+./fextractor mgmt.o
+mv -f speedtch-1.bin{,.4.00}
+mv -f speedtch-2.bin{,.4.00}
 
-# uncomment below if you have an old green (revision 0) or a purple (revision 2) modem
-# revision=0 # or revision=2
-# cp -f KQD6_%{version} mgmt.o
-
+# for an old green (revision 0) or a purple (revision 2) modem
+cp -f KQD6_%{version} mgmt.o
 ./fextractor mgmt.o
-mv speedtch-1.bin{,.$revision.00}
-mv speedtch-2.bin{,.$revision.00}
+mv -f speedtch-1.bin{,.0.00}
+mv -f speedtch-2.bin{,.0.00}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/speedtouch
 install -d $RPM_BUILD_ROOT/lib/firmware
 
-install mgmt.o $RPM_BUILD_ROOT%{_datadir}/speedtouch
+install mgmt/mgmt.o $RPM_BUILD_ROOT%{_datadir}/speedtouch
 install speedtch-* $RPM_BUILD_ROOT/lib/firmware
+ln -s speedtch-1.bin.0.00 $RPM_BUILD_ROOT/lib/firmware/speedtch-1.bin.2.00
+ln -s speedtch-2.bin.0.00 $RPM_BUILD_ROOT/lib/firmware/speedtch-2.bin.2.00
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(600,root,root) /lib/firmware/*
+/lib/firmware/*
 %{_datadir}/speedtouch/mgmt.o
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -77,6 +82,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/11/29 21:39:25  qboosh
+- let package support revisions 0,2,4 instead of only 4
+- include mgmt.o actually _working_ with modem_run
+- no need to hide firmware from users
+
 Revision 1.5  2005/11/29 21:14:04  qboosh
 - final package is noarch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/speedtouch-firmware.spec?r1=1.5&r2=1.6&f=u