Author: glen Date: Thu Jul 3 14:01:40 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merges from LINUX_2_6_22 (AC) branch
---- Files affected:
SPECS:
zaptel.spec (1.113 -> 1.114)
---- Diffs:
================================================================
Index: SPECS/zaptel.spec
diff -u SPECS/zaptel.spec:1.113 SPECS/zaptel.spec:1.114
--- SPECS/zaptel.spec:1.113 Sun Jun 29 17:39:05 2008
+++ SPECS/zaptel.spec Thu Jul 3 16:01:35 2008
@@ -14,10 +14,14 @@
%bcond_without userspace # don't build userspace tools
%bcond_with oslec # with Open Source Line Echo Canceller
%bcond_with bristuff # with bristuff support
+%bcond_without xpp # without Astribank
%ifarch sparc
%undefine with_smp
%endif
+%ifarch alpha
+%undefine with_xpp
+%endif
%if %{without kernel}
%undefine with_dist_kernel
@@ -63,11 +67,15 @@
%{?with_bristuff:Provides: zaptel(bristuff)}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define modules_1
pciradio,tor2,torisa,wcfxo,wct1xxp,wct4xxp/wct4xxp,
-%define modules_2
wctdm,wcte11xp,wcusb,zaptel,ztd-eth,ztd-loc,ztdummy,ztdynamic
-%define modules_3
wctc4xxp/wctc4xxp,wctdm24xxp/wctdm24xxp,wcte12xp/wcte12xp,zttranscode
-%define modules_4 xpp/{xpd_fxo,xpd_fxs,xpd_pri,xpp,xpp_usb}
-%define modules
%{modules_1},%{modules_2},%{modules_3},%{modules_4}
+%define modules_1
zaptel,ztd-eth,ztd-loc,pciradio,tor2,torisa,wcfxo,wct1xxp,wctdm,wcte11xp,wcusb,ztdummy,ztdynamic
+%define modules_2
wct4xxp/wct4xxp,wcte12xp/wcte12xp%{?with_xpp:,xpp/{xpd_fxo,xpd_fxs,xpd_pri,xpp,xpp_usb}}
+%ifnarch alpha
+%define modules_nalpha
wctc4xxp/wctc4xxp,wctdm24xxp/wctdm24xxp,zttranscode
+%endif
+%if %{with bristuff}
+%define modules_bristuff
cwain/cwain,qozap/qozap,vzaphfc/vzaphfc,zaphfc/zaphfc,ztgsm/ztgsm,opvxa1200,wcopenpci
+%endif
+%define modules
%{modules_1},%{modules_2}%{?modules_nalpha:,%{modules_nalpha}}%{?modules_bristuff:,%{modules_bristuff}}
%if %{without userspace}
# nothing to be placed to debuginfo package
@@ -268,7 +276,9 @@
%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/zaptel.conf
%attr(755,root,root) /sbin/*
%attr(755,root,root) %{_libdir}/*.so.*
+%if %{with xpp}
%{_datadir}/zaptel
+%endif
%{_mandir}/man8/*
%files init
@@ -289,11 +299,13 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_sbindir}/*
+%if %{with xpp}
%files -n perl-Zaptel
%defattr(644,root,root,755)
%{perl_vendorlib}/Zaptel
%{perl_vendorlib}/Zaptel.pm
%endif
+%endif
%if %{with kernel}
%files -n kernel%{_alt_kernel}-%{pname}
@@ -307,6 +319,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.114 2008/07/03 14:01:35 glen
+- merges from LINUX_2_6_22 (AC) branch
+
Revision 1.113 2008/06/29 15:39:05 areq
- 1.4.11
- remove outdated sangoma patch from wanpipe
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zaptel.spec?r1=1.113&r2=1.114&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
