SPECS: wanpipe.spec - blacklist old wanruter module from kernel source - fi...

[areq]

Author: areq                         Date: Sun Jun 29 21:17:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- blacklist old wanruter module from kernel source
- fix Native Zaptel HW HDLC Support Detect

---- Files affected:
SPECS:
   wanpipe.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: SPECS/wanpipe.spec
diff -u SPECS/wanpipe.spec:1.50 SPECS/wanpipe.spec:1.51
--- SPECS/wanpipe.spec:1.50	Sat Jun 28 14:36:30 2008
+++ SPECS/wanpipe.spec	Sun Jun 29 23:17:48 2008
@@ -8,7 +8,7 @@
 %undefine	with_dist_kernel
 %endif
 
-%define		rel    0.1
+%define		rel    0.3
 
 Summary:	WAN routing package for Sangoma cards
 Summary(pl.UTF-8):	Pakiet do rutingu WAN dla kart Sangoma
@@ -86,7 +86,9 @@
 mkdir util/wanec_client/tmp
 cp patches/kdrivers/wanec/wanec_iface.h patches/kdrivers/include
 cp -a patches/kdrivers/wanec/oct6100_api/include/* patches/kdrivers/include
-echo "exit 1" >  patches/sangoma-zaptel-patch.sh
+
+#hack to Native Zaptel HW HDLC Support Detect
+sed -i 's/zaptel-base.c/zaptel.h/' Setup
 
 %build
 
@@ -123,20 +125,31 @@
 install firmware/*.sfm $RPM_BUILD_ROOT%{_datadir}/wanrouter/firmware
 #install util/wancfg/lib/* $RPM_BUILD_ROOT%{_datadir}/wanrouter/wancfg
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/wanrouter
+#install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/wanrouter
+install samples/wanrouter $RPM_BUILD_ROOT/etc/rc.d/init.d/wanrouter
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/wanrouter
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
 
 touch $RPM_BUILD_ROOT/var/log/wanrouter
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/{net/wanrouter,drivers/net/wan}
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/{net/wanrouter,drivers/net/wan} \
+	$RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}
 
 install  modules/lib/modules/*/kernel/net/wanrouter/*.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/wanrouter
 
+mv $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/wanrouter/wanrouter.ko \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/wanrouter/wanrouter-current.ko
+
 install  modules/lib/modules/*/kernel/drivers/net/wan/*.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/wan
+
+# blacklist kernel module
+cat > $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/wanpipe.conf <<'EOF'
+blacklist wanrouter
+alias wanrouter wanrouter-current
+EOF
 %endif
 
 %clean
@@ -182,6 +195,7 @@
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-%{name}
 %defattr(644,root,root,755)
+/etc/modprobe.d/%{_kernel_ver}/wanpipe.conf
 /lib/modules/%{_kernel_ver}/kernel/net/wanrouter/*.ko*
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/wan/*.ko*
 %endif
@@ -192,6 +206,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2008/06/29 21:17:48  areq
+- blacklist old wanruter module from kernel source
+- fix Native Zaptel HW HDLC Support Detect
+
 Revision 1.50  2008/06/28 12:36:30  areq
 - Enable TDMV DCHAN Native HDLC Support
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/wanpipe.spec?r1=1.50&r2=1.51&f=u