SPECS (AC-branch): zaptel.spec - take different approach, use modu...

[glen]

Author: glen                         Date: Mon Mar 19 21:10:52 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- take different approach, use modules known to build with previous version

---- Files affected:
SPECS:
   zaptel.spec (1.75.2.10 -> 1.75.2.11) 

---- Diffs:

================================================================
Index: SPECS/zaptel.spec
diff -u SPECS/zaptel.spec:1.75.2.10 SPECS/zaptel.spec:1.75.2.11
--- SPECS/zaptel.spec:1.75.2.10	Mon Mar 19 22:03:32 2007
+++ SPECS/zaptel.spec	Mon Mar 19 22:10:47 2007
@@ -47,33 +47,15 @@
 BuildRequires:	rpmbuild(macros) >= 1.330
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# fails on those archidectures
-# xpp/xpd_fxo is missing on ppc,alpha,sparc
-# xpp/xpp is missing on ppc,sparc,alpha
-# xpp/xpp_usb is missing on ppc,sparc,alpha
-%ifnarch ppc alpha sparc
-	# xpp/xpd_fxs is missing on ppc,sparc
-	%ifnarch ppc sparc
-	%define	modules_xpp xpp/{xpd_fxo,xpd_fxs,xpp,xpp_usb}
-	%else
-	%define	modules_xpp xpp/{xpd_fxs,xpp,xpp_usb}
-	%endif
-%else
-%define	modules_xpp %{nil}
-%endif
-
-%define	modules_wct	wct1xxp,wct4xxp/wct4xxp,wctc4xxp/wctc4xxp,wctdm,wctdm24xxp,wcte11xp,wcte12xp
+%define	modules_1	pciradio,tor2,torisa,wcfxo,wct1xxp,wct4xxp/wct4xxp,
+%define	modules_2	wctdm,wctdm24xxp,wcte11xp,wcusb,zaptel,ztd-eth,ztd-loc,ztdummy,ztdynamic
 
-# zttranscode is missing on alpha
-%ifnarch alpha
-%define	modules_zt	ztdummy,ztdynamic,zttranscode
-%else
-%define	modules_zt	ztdummy,ztdynamic
+# modules added in 1.2.15 (see r1.75.2.2)
+%ifnarch ppc alpha sparc
+%define	modules_1_2_15  wctc4xxp/wctc4xxp,wcte12xp,xpp/{xpd_fxo,xpd_fxs,xpp,xpp_usb},zttranscode
 %endif
 
-%define	modules_1	pciradio,tor2,torisa,wcfxo,wcusb,zaptel,ztd-eth,ztd-loc
-
-%define	modules	%{modules_1},%{modules_wct},%{modules_zt}%{?modules_xpp:,%{modules_xpp}}
+%define	modules		%{modules_1},%{modules_2}%{?modules_1_2_15:,%{modules_1_2_15}}
 
 %description
 Zaptel telephony device driver.
@@ -263,6 +245,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.75.2.11  2007/03/19 21:10:47  glen
+- take different approach, use modules known to build with previous version
+
 Revision 1.75.2.10  2007/03/19 21:03:32  glen
 - update
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/zaptel.spec?r1=1.75.2.10&r2=1.75.2.11&f=u