SPECS: zaptel.spec - better firmware download handling

[glen]

Author: glen                         Date: Fri Apr  4 16:46:14 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- better firmware download handling

---- Files affected:
SPECS:
   zaptel.spec (1.107 -> 1.108) 

---- Diffs:

================================================================
Index: SPECS/zaptel.spec
diff -u SPECS/zaptel.spec:1.107 SPECS/zaptel.spec:1.108
--- SPECS/zaptel.spec:1.107	Fri Apr  4 18:32:02 2008
+++ SPECS/zaptel.spec	Fri Apr  4 18:46:09 2008
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO:
-# - download files to df not let it download with wget
 # Installed (but unpackaged) file(s) found:
 #   /etc/hotplug/usb/xpp_fxloader
 #   /etc/hotplug/usb/xpp_fxloader.usermap
@@ -26,6 +25,8 @@
 
 %define		rel	4.1
 %define		pname	zaptel
+%define		FIRMWARE_URL http://downloads.digium.com/pub/telephony/firmware/releases
+
 Summary:	Zaptel telephony device support
 Summary(pl.UTF-8):	Obsługa urządzeń telefonicznych Zaptel
 Name:		%{pname}%{_alt_kernel}
@@ -37,14 +38,16 @@
 # Source0-md5:	f57e1ba86a3dd4ef141ca3831e11c076
 Source1:	%{pname}.init
 Source2:	%{pname}.sysconfig
-Source3:	http://ftp.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-064-1.05.01.tar.gz
+Source3:	%{FIRMWARE_URL}/zaptel-fw-oct6114-064-1.05.01.tar.gz
 # Source3-md5:	18e6e6879070a8d61068e1c87b8c2b22
-Source4:	http://ftp.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-128-1.05.01.tar.gz
+Source4:	%{FIRMWARE_URL}/zaptel-fw-oct6114-128-1.05.01.tar.gz
 # Source4-md5:	c46a13f468b53828dc5c78f0eadbefd4
-Source5:	http://ftp.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR5.6.tar.gz
+Source5:	%{FIRMWARE_URL}/zaptel-fw-tc400m-MR5.6.tar.gz
 # Source5-md5:	ec5c96f7508bfb0e0b8be768ea5f3aa2
-Source6:	http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-vpmadt032-1.07.tar.gz
+Source6:	%{FIRMWARE_URL}/zaptel-fw-vpmadt032-1.07.tar.gz
 # Source6-md5:	7916c630a68fcfd38ead6caf9b55e5a1
+Source7:	%{FIRMWARE_URL}/zaptel-fw-tc400m-MR6.12.tar.gz
+# Source7-md5:	c57f41fae88f129e14fcaf41e4df90dc
 Patch0:		%{pname}-make.patch
 Patch1:		%{pname}-sangoma.patch
 Patch2:		%{pname}-oslec.patch
@@ -160,10 +163,17 @@
 %{?with_bristuff:%patch3 -p1}
 
 %if %{with kernel}
-tar -C firmware -xzf %{SOURCE3}
-tar -C firmware -xzf %{SOURCE4}
-tar -C firmware -xzf %{SOURCE5}
-tar -C firmware -xzf %{SOURCE6}
+for a in  %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
+	ln -s $a firmware
+	tar -C firmware -xzf $a
+done
+
+cat > download-logger <<'EOF'
+#!/bin/sh
+# keep log of files make wanted to download in firmware/ dir
+echo "$@" >> download.log
+EOF
+chmod a+rx download-logger
 %endif
 
 %build
@@ -176,7 +186,7 @@
 %endif
 
 %if %{with kernel}
-%build_kernel_modules SUBDIRS=$PWD DOWNLOAD=wget ZAP="-I$PWD" KSRC=%{_kernelsrcdir} -m %{modules}
+%build_kernel_modules SUBDIRS=$PWD DOWNLOAD=$PWD/download-logger ZAP="-I$PWD" KSRC=%{_kernelsrcdir} -m %{modules}
 %endif
 
 %if %{with userspace}
@@ -277,6 +287,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2008-04-04 16:46:09  glen
+- better firmware download handling
+
 Revision 1.107  2008-04-04 16:32:02  glen
 - add kernel build macros back (discarded in r1.83 with 1.4.1 merge from DEVEL)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zaptel.spec?r1=1.107&r2=1.108&f=u