Author: arekm Date: Wed Jul 16 22:35:58 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2; build correctly also when bristuff is disabled
---- Files affected: SPECS: zaptel.spec (1.115 -> 1.116) ---- Diffs: ================================================================ Index: SPECS/zaptel.spec diff -u SPECS/zaptel.spec:1.115 SPECS/zaptel.spec:1.116 --- SPECS/zaptel.spec:1.115 Thu Jul 17 00:30:35 2008 +++ SPECS/zaptel.spec Thu Jul 17 00:35:53 2008 @@ -30,7 +30,7 @@ %undefine with_userspace %endif -%define rel 1 +%define rel 2 %define pname zaptel %define FIRMWARE_URL http://downloads.digium.com/pub/telephony/firmware/releases Summary: Zaptel telephony device support @@ -77,7 +77,7 @@ %define modules_1_in zaptel,ztd-eth,ztd-loc,pciradio,tor2,torisa,wcfxo,wct1xxp,wctdm,wcte11xp,wcusb,ztdummy,ztdynamic %define modules_2 wct4xxp/ wcte12xp/ %{?with_xpp:xpp/} -%define modules_2_in wct4xxp/wct4xxp,wcte12xp/wcte12xp%{?with_xpp:,xpp/{xpd_bri,xpd_fxo,xpd_fxs,xpd_pri,xpp,xpp_usb}} +%define modules_2_in wct4xxp/wct4xxp,wcte12xp/wcte12xp%{?with_xpp:,xpp/{%{?with_bristuff:xpd_bri,}xpd_fxo,xpd_fxs,xpd_pri,xpp,xpp_usb}} %ifnarch alpha %define modules_nalpha wctc4xxp/ wctdm24xxp/ zttranscode.o %define modules_nalpha_in wctc4xxp/wctc4xxp,wctdm24xxp/wctdm24xxp,zttranscode @@ -228,7 +228,7 @@ %{__make} zttool zttest ztmonitor ztspeed sethdlc-new ztcfg \ ztcfg-dude fxstest fxotune ztdiag torisatool \ %{?with_bristuff:ztpty} libtonezone.so \ - CC="%{__cc} %{rpmcflags} -I$(pwd)/kernel" \ + CC="%{__cc} %{rpmcflags}" \ LDFLAGS="%{rpmldflags}" \ KSRC=%{_kernelsrcdir} %endif @@ -329,6 +329,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.116 2008/07/16 22:35:53 arekm +- rel 2; build correctly also when bristuff is disabled + Revision 1.115 2008/07/16 22:30:35 arekm - rel 1; stop using ugly rules; use beautiful one ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zaptel.spec?r1=1.115&r2=1.116&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
