Author: hawk Date: Tue Jul 14 19:10:31 2009 GMT Module: packages Tag: HEAD ---- Log message: - dopped bristuff (no -bristuff patch here so these drivers aren't available at all) - dropped TODO (it was copied from zaptel.spec and these issue no longer exist) - builds fine, release 1
---- Files affected: packages/dahdi-linux: dahdi-linux.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: packages/dahdi-linux/dahdi-linux.spec diff -u packages/dahdi-linux/dahdi-linux.spec:1.5 packages/dahdi-linux/dahdi-linux.spec:1.6 --- packages/dahdi-linux/dahdi-linux.spec:1.5 Tue Jul 14 20:46:05 2009 +++ packages/dahdi-linux/dahdi-linux.spec Tue Jul 14 21:10:26 2009 @@ -3,17 +3,9 @@ # TODO: # - IMPORTANT rename: http://www.asterisk.org/zaptel-to-dahdi # -# - kernel modules doesn't build -# - should more header files be installed? -# - Installed (but unpackaged) file(s) found: -# /etc/hotplug/usb/xpp_fxloader -# /etc/hotplug/usb/xpp_fxloader.usermap -# /etc/udev/rules.d/xpp.rules -# # Conditional build: %bcond_without dist_kernel # without distribution kernel %bcond_with oslec # with Open Source Line Echo Canceller -%bcond_with bristuff # with bristuff support %bcond_without xpp # without Astribank %bcond_with verbose @@ -24,14 +16,14 @@ %undefine with_xpp %endif -%define rel 0.1 +%define rel 1 %define pname dahdi-linux %define FIRMWARE_URL http://downloads.digium.com/pub/telephony/firmware/releases Summary: DAHDI telephony device support Summary(pl.UTF-8): Obsługa urządzeń telefonicznych DAHDI Name: %{pname}%{_alt_kernel} Version: 2.2.0.1 -Release: %{rel}%{?with_bristuff:.bristuff} +Release: %{rel} License: GPL Group: Base/Kernel Source0: http://downloads.digium.com/pub/telephony/dahdi-linux/dahdi-linux-%{version}.tar.gz @@ -53,7 +45,6 @@ BuildRequires: perl-base BuildRequires: perl-tools-pod BuildRequires: rpmbuild(macros) >= 1.379 -%{?with_bristuff:Provides: dahdi(bristuff)} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # Rules: @@ -65,18 +56,14 @@ %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} +%define modules_2_in voicebus/dahdi_voicebus,wct4xxp/wct4xxp,wcte12xp/wcte12xp,%{?with_xpp: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 %endif -%if %{with bristuff} -%define modules_bristuff cwain/ qozap/ vzaphfc/ zaphfc/ ztgsm/ opvxa1200.o wcopenpci.o -%define modules_bristuff_in 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}} -%define modules_in %{modules_1_in},%{modules_2_in}%{?modules_nalpha:,%{modules_nalpha_in}}%{?modules_bristuff:,%{modules_bristuff_in}} +%define modules %{modules_1} %{modules_2}%{?modules_nalpha: %{modules_nalpha}} +%define modules_in %{modules_1_in},%{modules_2_in}%{?modules_nalpha:,%{modules_nalpha_in}} %description DAHDI telephony device driver. @@ -179,6 +166,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2009/07/14 19:10:26 hawk +- dopped bristuff (no -bristuff patch here so these drivers aren't + available at all) +- dropped TODO (it was copied from zaptel.spec and these issue no + longer exist) +- builds fine, release 1 + Revision 1.5 2009/07/14 18:46:05 hawk - sorted modules_1, fixed modules_2 - now it expands correctly ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dahdi-linux/dahdi-linux.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
