Release 2 (by relup.sh)

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

diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 370c7b900b9e102892a54de4415052f0f403bd6e..1ed516a09b9189bb169914c1fc5bd302bb3a5fff 100644 (file)
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -1,23 +1,15 @@
 #
 # TODO:
 # - IMPORTANT rename: http://www.asterisk.org/zaptel-to-dahdi
-# - Fix --without xpp:
-#   + check_modules
-#   unpackaged module: drivers/dahdi/xpp/xpd_bri
-#   unpackaged module: drivers/dahdi/xpp/xpd_fxo
-#   unpackaged module: drivers/dahdi/xpp/xpd_fxs
-#   unpackaged module: drivers/dahdi/xpp/xpd_pri
-#   unpackaged module: drivers/dahdi/xpp/xpp
-#   unpackaged module: drivers/dahdi/xpp/xpp_usb
 #
 # Conditional build:
-%bcond_without  kernel         # don't build kernel modules
-%bcond_with    oslec           # with Open Source Line Echo Canceller
-%bcond_without xpp             # without Astribank
-%bcond_without userspace       # don't build userspace packages
+%bcond_without kernel          # kernel modules
+%bcond_with    oslec           # Open Source Line Echo Canceller
+%bcond_without xpp             # Xorcom Astribank support
+%bcond_without userspace       # userspace packages
 %bcond_with    verbose
 
-%ifarch alpha
+%ifarch alpha %{ix86}
 %undefine      with_xpp
 %endif
 
@@ -30,23 +22,21 @@
 exit 1
 %endif
 
-%if %{without userspace}
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
-%endif
 
-%define                rel     1
+%define                rel     2
 %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}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       3.1.0
+Version:       3.3.0
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-%{version}.tar.gz
-# Source0-md5: 17d7542e613afd6cf860516fe785d56c
+# Source0-md5: 650e2f9ccae7efb850ce1914c768af83
 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
@@ -57,8 +47,8 @@ Source6:      %{FIRMWARE_URL}/dahdi-fw-tc400m-MR6.12.tar.gz
 # Source6-md5: 2ea860bb8a9d8ede2858b9557b74ee3c
 Source7:       %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
 # Source7-md5: a7f3886942bb3e9fed349a41b3390c9f
-Patch0:                kernel-4.14.patch
-Patch1:                kernel-5.4.patch
+Patch0:                kernel-strcpy.patch
+Patch3:                no-xpp.patch
 URL:           http://www.asterisk.org/
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 BuildRequires: perl-base
@@ -145,7 +135,7 @@ Sterownik dla jądra Linuksa do urządzeń telefonicznych DAHDI.\
 
 %define build_kernel_pkg()\
 %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\
+%build_kernel_modules V=1 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\
 cd drivers/dahdi\
 %install_kernel_modules -D ../../installed -m %{modules_in} -d misc\
 cd ../..\
@@ -157,7 +147,9 @@ cd ../..\
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
-%patch1 -p1
+%if %{without xpp}
+%patch3 -p1
+%endif
 
 for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
        ln -s $a drivers/dahdi/firmware