commit 7f74adf44066b76f5689cf0096d24fa808c760f9
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Tue Jan 27 20:13:20 2015 +0100
- drop non-dist kernel support
xtables-addons.spec | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 36ad0ab..ef2d10d 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -3,15 +3,10 @@
#
#
# Conditional build:
-%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_without userspace # don't build userspace tools
%bcond_with verbose # verbose build (V=1)
-%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
@@ -59,7 +54,7 @@ BuildRequires: iptables-devel >= 1.4.5
BuildRequires: libtool
BuildRequires: pkgconfig >= 0.9.0
BuildRequires: rpmbuild(macros) >= 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
BuildRequires: tar >= 1.22
BuildRequires: xz
Requires: iptables >= 1.4.5
@@ -95,10 +90,8 @@ Requires: %{pname} = %{version}\
Suggests: xtables-geoip\
Conflicts: xtables-geoip < 20090901-2\
Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
%requires_releq_kernel\
Requires(postun): %releq_kernel\
-%endif\
\
%description -n kernel%{_alt_kernel}-net-xtables-addons\
Kernel modules for xtables addons.\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xtables-addons.git/commitdiff/9c8de23f3845f732cfcf3f3be743294c7a2d4586
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
