commit 16c064e528a03aa8aba7912fa0227106849c52c5
Author: Jan Rękorajski <[email protected]>
Date: Tue Jan 27 19:14:04 2015 +0100
- drop non-dist kernel support
dahdi-linux.spec | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 0aa1002..0b3f534 100644
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -11,7 +11,6 @@
# unpackaged module: drivers/dahdi/xpp/xpp_usb
#
# Conditional build:
-%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_with oslec # with Open Source Line Echo Canceller
%bcond_without xpp # without Astribank
@@ -22,10 +21,6 @@
%undefine with_xpp
%endif
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-
# The goal here is to have main, userspace, package built once with
# simple release number, and only rebuild kernel packages with kernel
# version as part of release number, without the need to bump release
@@ -80,7 +75,7 @@ Source7: %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
Patch0: linux-3.18.patch
URL: http://www.asterisk.org/
BuildRequires: rpmbuild(macros) >= 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
BuildRequires: perl-base
BuildRequires: rpmbuild(macros) >= 1.379
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -126,11 +121,9 @@ Summary(pl.UTF-8): Sterownik DAHDI dla jądra Linuksa\
Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
%{?with_oslec:Requires: kernel-misc-oslec =
20070608-0.1@%{_kernel_ver_str}}\
-%endif\
\
%description -n kernel%{_alt_kernel}-%{pname}\
DAHDI telephony Linux kernel driver.\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dahdi-linux.git/commitdiff/fcd3b77f2ee888bc6838800f093860cd572f2a81
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
