packages: dahdi-linux/dahdi-linux.spec - sorted modules_1, fixed modules_2 ...

[hawk]

Author: hawk                         Date: Tue Jul 14 18:46:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- sorted modules_1, fixed modules_2 - now it expands correctly

---- Files affected:
packages/dahdi-linux:
   dahdi-linux.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/dahdi-linux/dahdi-linux.spec
diff -u packages/dahdi-linux/dahdi-linux.spec:1.4 packages/dahdi-linux/dahdi-linux.spec:1.5
--- packages/dahdi-linux/dahdi-linux.spec:1.4	Tue Jul 14 20:20:35 2009
+++ packages/dahdi-linux/dahdi-linux.spec	Tue Jul 14 20:46:05 2009
@@ -62,10 +62,10 @@
 # - keep X and X_in in sync
 # - X is used for actual building (entries separated with space), X_in for pld macros (entries separated with comma)
 
-%define	modules_1	dahdi.o dahdi_dynamic_eth.o dahdi_dynamic_loc.o pciradio.o tor2.o wcfxo.o wct1xxp.o wctdm.o wcte11xp.o dahdi_dummy.o dahdi_dynamic.o dahdi_echocan_jpah.o dahdi_echocan_kb1.o dahdi_echocan_mg2.o dahdi_echocan_sec.o dahdi_echocan_sec2.o
-%define	modules_1_in	dahdi,dahdi_dynamic_eth,dahdi_dynamic_loc,pciradio,tor2,wcfxo,wct1xxp,wctdm,wcte11xp,dahdi_dummy,dahdi_dynamic,dahdi_echocan_jpah,dahdi_echocan_kb1,dahdi_echocan_mg2,dahdi_echocan_sec,dahdi_echocan_sec2
-%define	modules_2	voicebuss/ wct4xxp/ wcte12xp/ %{?with_xpp:xpp/}
-%define	modules_2_in	voicebus/dahdivoicebus,wct4xxp/wct4xxp,wcte12xp/wcte12xp%{?with_xpp:,xpp/{%{?with_bristuff:xpd_bri,}xpd_fxo,xpd_fxs,xpd_pri,xpp,xpp_usb}}
+%define	modules_1	dahdi.o dahdi_dynamic.o dahdi_dynamic_eth.o dahdi_dynamic_loc.o dahdi_dummy.o dahdi_echocan_jpah.o dahdi_echocan_kb1.o dahdi_echocan_mg2.o dahdi_echocan_sec.o dahdi_echocan_sec2.o pciradio.o tor2.o wcfxo.o wct1xxp.o wctdm.o wcte11xp.o 
+%define	modules_1_in	dahdi,dahdi_dynamic,dahdi_dynamic_eth,dahdi_dynamic_loc,dahdi_dummy,dahdi_echocan_jpah,dahdi_echocan_kb1,dahdi_echocan_mg2,dahdi_echocan_sec,dahdi_echocan_sec2,pciradio,tor2,wcfxo,wct1xxp,wctdm,wcte11xp
+%define	modules_2	voicebuss wct4xxp/ wcte12xp/ %{?with_xpp:xpp/}
+%define	modules_2_in	voicebus/dahdi_voicebus,wct4xxp/wct4xxp,wcte12xp/wcte12xp,%{?with_xpp:%{?with_bristuff:xpp/xpd_bri,}xpp/xpd_fxo,xpp/xpd_fxs,xpp/xpd_pri,xpp/xpp,xpp/xpp_usb}
 %ifnarch alpha
 %define	modules_nalpha	wctc4xxp/ wctdm24xxp/ dahdi_transcode.o wcb4xxp/
 %define	modules_nalpha_in	wctc4xxp/wctc4xxp,wctdm24xxp/wctdm24xxp,dahdi_transcode,wcb4xxp/wcb4xxp
@@ -179,6 +179,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2009/07/14 18:46:05  hawk
+- sorted modules_1, fixed modules_2 - now it expands correctly
+
 Revision 1.4  2009/07/14 18:20:35  hawk
 - started work on 2.2.0.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dahdi-linux/dahdi-linux.spec?r1=1.4&r2=1.5&f=u