SPECS: speedtouch-firmware.spec - drop userspace package - no sources to fe...

[blues]

Author: blues                        Date: Sun Feb 22 14:51:50 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop userspace package - no sources to fetch and pointless now

---- Files affected:
SPECS:
   speedtouch-firmware.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/speedtouch-firmware.spec
diff -u SPECS/speedtouch-firmware.spec:1.12 SPECS/speedtouch-firmware.spec:1.13
--- SPECS/speedtouch-firmware.spec:1.12	Thu Nov 29 21:12:05 2007
+++ SPECS/speedtouch-firmware.spec	Sun Feb 22 15:51:44 2009
@@ -3,19 +3,17 @@
 Summary(pl.UTF-8):	Firmware dla modemu ADSL Alcatel SpeedTouch w wersji USB
 Name:		speedtouch-firmware
 Version:	3.012
-Release:	2
+Release:	3
 License:	restricted, non-distributable
 Group:		Libraries
 Source0:	http://www.speedtouch.com/download/drivers/USB/SpeedTouch330_firmware_3012.zip
 # NoSource0-md5:	2551ce46ef785642f2c6768511f70ff3
-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
+Source1:	http://www.linux-usb.org/SpeedTouch/firmware/firmware-extractor.tar.gz
+# Source1-md5:	752e33faf0b62176114e757dfc1e7191
 NoSource:	0
-NoSource:	1
-URL:		http://www.speedtouchdsl.com/
+URL:		http://www.thomson.net/GlobalEnglish/Products/dsl-modems-gateways/residential_wired/other_supported_products/thomson_st330/Pages/default.aspx
 BuildRequires:	unzip
+Obsoletes:	speedtouch-firmware-userspace
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -28,34 +26,8 @@
 wczytywania przez mechanizm jądra (w nowych wersjach Linuksa 2.6.x
 z narzędziem udev lub hotplug).
 
-%package userspace
-Summary:	Alcatel SpeedTouch USB ADSL modem firmware for modem_run loader
-Summary(pl.UTF-8):	Firmware modemu ADSL Alcatel SpeedTouch USB dla narzędzia modem_run
-Group:		Libraries
-Requires:	speedtouch >= 1.2-1
-
-%description userspace
-Alcatel SpeedTouch USB ADSL modem firmware, needed for modem_run
-utility (speedtouch package). Load it by:
-
-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).
-
-%description userspace -l pl.UTF-8
-Firmware dla modemu ADSL Alcatel SpeedTouch w wersji USB - potrzebne
-dla narzędzia modem_run (z pakietu speedtouch). Wczytuje się je
-poprzez:
-
-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 -c -a1 -a2
+%setup -q -c -a1
 
 %build
 %{__cc} %{rpmcflags} -o fextractor firmware-extractor/firmware.c
@@ -73,9 +45,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/speedtouch,/lib/firmware}
+install -d $RPM_BUILD_ROOT/lib/firmware
 
-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
@@ -92,16 +63,15 @@
 /lib/firmware/speedtch-1.bin.4.00
 /lib/firmware/speedtch-2.bin.4.00
 
-%files userspace
-%defattr(644,root,root,755)
-%{_datadir}/speedtouch/mgmt.o
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2009/02/22 14:51:44  blues
+- drop userspace package - no sources to fetch and pointless now
+
 Revision 1.12  2007/11/29 20:12:05  qboosh
 - separated userspace, needed only for modem_run, not kernel loader
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/speedtouch-firmware.spec?r1=1.12&r2=1.13&f=u