SPECS: speedtouch-firmware.spec - updated to 3.012 - extracted and...

[charles]

Author: charles                      Date: Thu Nov 24 18:48:10 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 3.012
- extracted and added firmware files (now it works fine with kernel >= 2.6.10)
- updated desc (-m option is obsolete)

---- Files affected:
SPECS:
   speedtouch-firmware.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/speedtouch-firmware.spec
diff -u SPECS/speedtouch-firmware.spec:1.3 SPECS/speedtouch-firmware.spec:1.4
--- SPECS/speedtouch-firmware.spec:1.3	Fri Oct 29 13:17:59 2004
+++ SPECS/speedtouch-firmware.spec	Thu Nov 24 19:48:04 2005
@@ -2,16 +2,17 @@
 Summary:	Alcatel SpeedTouch USB ADSL modem firmware
 Summary(pl):	Firmware dla modemu ADSL Alcatel SpeedTouch w wersji USB
 Name:		speedtouch-firmware
-Version:	1.3.4
-Release:	2
+Version:	3.012
+Release:	1
 License:	restricted, non-distributable
 Group:		Libraries
-# get it from Alcatel at http://www.speedtouchdsl.com/dvrreg_lx.htm (requires registration)
-# or from Neostrada CD (Linux/ThomsonST330/pliki.tar.gz#utar:drivers)
-Source0:	speedmgmt.tar.gz
-# NoSource0-md5: 102dc7a457c3942ee21dc834db68eac2
+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
 NoSource:	0
 URL:		http://www.speedtouchdsl.com/
+BuildRequires:	unzip
 Requires:	speedtouch >= 1.2-1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -19,7 +20,7 @@
 Alcatel SpeedTouch USB ADSL modem firmware, needed for modem_run
 utility (speedtouch package). Load it by:
 
-modem_run [-k] -m -f /usr/share/speedtouch/mgmt.o
+modem_run [-k] -f /usr/share/speedtouch/mgmt.o
 
 (-k if you are using kernel driver from Linux 2.4.22+/2.6 instead of
 userspace pppoa utility).
@@ -29,27 +30,44 @@
 dla narzędzia modem_run (z pakietu speedtouch). Wczytuje się je
 poprzez:
 
-modem_run [-k] -m -f /usr/share/speedtouch/mgmt.o
+modem_run [-k] -f /usr/share/speedtouch/mgmt.o
 
 (-k należy dodawać w przypadku używania sterownika w przestrzeni jądra
 dostępnego w Linuksie 2.4.22+/2.6 zamiast narzędzia pppoa działającego
 w przestrzeni użytkownika).
 
 %prep
-%setup -q -n mgmt
+%setup -q -c -a1
+
+%build
+%{__cc} %{rpmcflags} -o fextractor firmware-extractor/firmware.c
+
+# for a silver (revision 4) modem
+revision=4
+cp -f ZZZL_%{version} mgmt.o
+
+# 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
+
+./fextractor mgmt.o
+mv speedtch-1.bin{,.$revision.00}
+mv speedtch-2.bin{,.$revision.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 speedtch-* $RPM_BUILD_ROOT/lib/firmware
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog LICENSE speedtch.usermap
+%attr(600,root,root) /lib/firmware/*
 %{_datadir}/speedtouch/mgmt.o
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -58,6 +76,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/11/24 18:48:04  charles
+- updated to 3.012
+- extracted and added firmware files (now it works fine with kernel >= 2.6.10)
+- updated desc (-m option is obsolete)
+
 Revision 1.3  2004/10/29 11:17:59  paladine
 - spelling fixes
 
================================================================

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