- updated to 2.7.0

[packages/dahdi-linux.git] / dahdi-linux.spec

diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 7b73c6b775346583c11c7301da805a448b8d40dd..6f6e959d86b3fc3ae9ae4180786b61f1b5c2b4c2 100644 (file)
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -38,12 +38,12 @@
 Summary:       DAHDI telephony device support
 Summary(pl.UTF-8):     Obsługa urządzeń telefonicznych DAHDI
 Name:          %{pname}%{_alt_kernel}
-Version:       2.6.0
+Version:       2.7.0
 Release:       %{rel}
-License:       GPL
+License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-%{version}.tar.gz
-# Source0-md5: ea35ad29dafe5490028ff642c35ef9a2
+# Source0-md5: ac0d7ed711130e8038b304c5e2f96334
 Source3:       %{FIRMWARE_URL}/dahdi-fw-oct6114-064-1.05.01.tar.gz
 # Source3-md5: 88db9b7a07d8392736171b1b3e6bcc66
 Source4:       %{FIRMWARE_URL}/dahdi-fw-oct6114-128-1.05.01.tar.gz
@@ -56,7 +56,6 @@ Source7:      %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
 # Source7-md5: a7f3886942bb3e9fed349a41b3390c9f
 Patch0:                %{pname}-build.patch
 # http://oss.axsentis.de/people/stkn/openzap/dahdi-2.4.0-linux-2.6.37.patch
-Patch1:                dahdi-2.4.0-linux-2.6.37.patch
 URL:           http://www.asterisk.org/
 %if %{with dist_kernel}
 BuildRequires: kernel%{_alt_kernel}-module-build
@@ -90,15 +89,15 @@ Sterownik do urządzeń telefonicznych DAHDI.
 
 %package devel
 Summary:       Header files for dahdi interface
+Summary(pl.UTF-8):     Pliki nagłówkowe interfejsu dahdi
 Group:         Development/Libraries
-# if base package contains shared library for which these headers are
-#Requires:     %{name} = %{version}-%{release}
-# if -libs package contains shared library for which these headers are
-#Requires:     %{name}-libs = %{version}-%{release}
 
 %description devel
 Header files for dahdi interface.
 
+%description devel -l pl.UTF-8
+Pliki nagłówkowe interfejsu dahdi.
+
 %package udev
 Summary:       udev rules for DAHDI kernel modules
 Summary(pl.UTF-8):     Reguły udev dla modułów jądra Linuksa dla DAHDI
@@ -134,7 +133,6 @@ Sterownik dla jądra Linuksa do urządzeń telefonicznych DAHDI.
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
-#%patch1 -p1
 
 for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
        ln -s $a drivers/dahdi/firmware
@@ -152,21 +150,10 @@ chmod a+rx download-logger
 %{__make} include/dahdi/version.h
 
 %if %{with kernel}
-%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
-       for a in drivers/dahdi/{*/,}*.ko; do
-               [[ $a = *-dist.ko ]] && continue
-               [[ $a = *-up.ko ]] && continue
-               [[ $a = *-smp.ko ]] && continue
-               echo >&2 "unpackaged module: ${a%.ko}"
-               err=1
-       done
-
-       [ $err = 0 ] || exit 1
-}
-check_modules
+# hack: build library first (using explicit "lib" target), then modules without cleaning (-c)
+%build_kernel_modules lib SUBDIRS=$PWD/drivers/dahdi DAHDI_BUILD_ALL=m HOTPLUG_FIRMWARE=yes DAHDI_MODULES_EXTRA=" " -m %{modules_in} KSRC=$PWD/o -C drivers/dahdi/oct612x 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 -c
 %endif
 
 %install
@@ -181,10 +168,8 @@ cd ../..
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT/etc/udev/rules.d
 
-%{make} \
-       DESTDIR=$RPM_BUILD_ROOT \
-       install-devices \
-       install-include
+%{__make} install-devices install-include \
+       DESTDIR=$RPM_BUILD_ROOT
 %endif
 
 %clean
@@ -210,5 +195,21 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-%{pname}
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*.ko*
+/lib/modules/%{_kernel_ver}/misc/dahdi*.ko*
+/lib/modules/%{_kernel_ver}/misc/pciradio.ko*
+/lib/modules/%{_kernel_ver}/misc/tor2.ko*
+/lib/modules/%{_kernel_ver}/misc/wcb4xxp.ko*
+/lib/modules/%{_kernel_ver}/misc/wcfxo.ko*
+/lib/modules/%{_kernel_ver}/misc/wct1xxp.ko*
+/lib/modules/%{_kernel_ver}/misc/wct4xxp.ko*
+/lib/modules/%{_kernel_ver}/misc/wctc4xxp.ko*
+/lib/modules/%{_kernel_ver}/misc/wctdm.ko*
+/lib/modules/%{_kernel_ver}/misc/wctdm24xxp.ko*
+/lib/modules/%{_kernel_ver}/misc/wcte11xp.ko*
+/lib/modules/%{_kernel_ver}/misc/wcte12xp.ko*
+%if %{with xpp}
+/lib/modules/%{_kernel_ver}/misc/xpd_*.ko*
+/lib/modules/%{_kernel_ver}/misc/xpp.ko*
+/lib/modules/%{_kernel_ver}/misc/xpp_usb.ko*
+%endif
 %endif