Author: sparky Date: Mon Feb 15 14:42:28 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- "kernel" bcond does not exist, removed reference to it
- dropped unused BR: module-init-tools, newt-devel, perl-tools-pod
---- Files affected:
packages/dahdi-linux:
dahdi-linux.spec (1.26 -> 1.27)
---- Diffs:
================================================================
Index: packages/dahdi-linux/dahdi-linux.spec
diff -u packages/dahdi-linux/dahdi-linux.spec:1.26
packages/dahdi-linux/dahdi-linux.spec:1.27
--- packages/dahdi-linux/dahdi-linux.spec:1.26 Mon Feb 15 10:40:14 2010
+++ packages/dahdi-linux/dahdi-linux.spec Mon Feb 15 15:42:23 2010
@@ -51,13 +51,10 @@
# Source6-md5: 2ea860bb8a9d8ede2858b9557b74ee3c
Patch0: %{name}-gentoo.patch
URL: http://www.asterisk.org/
-%if %{with kernel} && %{with dist_kernel}
+%if %{with dist_kernel}
BuildRequires: kernel%{_alt_kernel}-module-build
-BuildRequires: module-init-tools
%endif
-BuildRequires: newt-devel
BuildRequires: perl-base
-BuildRequires: perl-tools-pod
BuildRequires: rpmbuild(macros) >= 1.379
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,7 +64,7 @@
# - 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.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 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:xpp/xpd_bri,xpp/xpd_fxo,xpp/xpd_fxs,xpp/xpd_pri,xpp/xpp,xpp/xpp_usb}
@@ -147,7 +144,7 @@
%build
%{__make} include/dahdi/version.h
-%build_kernel_modules SUBDIRS=$PWD/drivers/dahdi DAHDI_BUILD_ALL=m
HOTPLUG_FIRMWARE=yes DAHDI_MODULES_EXTRA=" " -m %{modules_in} KSRC=$PWD/o -C
drivers/dahdi DAHDI_INCLUDE=$PWD/../../include
+%build_kernel_modules SUBDIRS=$PWD/drivers/dahdi DAHDI_BUILD_ALL=m
HOTPLUG_FIRMWARE=yes DAHDI_MODULES_EXTRA=" " -m %{modules_in} KSRC=$PWD/o -C
drivers/dahdi DAHDI_INCLUDE=$PWD/../../include
check_modules() {
err=0
@@ -209,6 +206,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.27 2010/02/15 14:42:23 sparky
+- "kernel" bcond does not exist, removed reference to it
+- dropped unused BR: module-init-tools, newt-devel, perl-tools-pod
+
Revision 1.26 2010/02/15 09:40:14 arekm
- release 13
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dahdi-linux/dahdi-linux.spec?r1=1.26&r2=1.27&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
