- drop non-dist kernel support

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 8f00e6b32a56e8a3d69383544d9073093539df35..56d2d22e13d889d3dc1bb12835aa9aa7c23ce1b1 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -3,15 +3,10 @@
 #
 #
 # Conditional build:
 #
 #
 # 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)
 
 %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
 # 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


@@ -56,7 +51,7 @@ URL:          http://xtables-addons.sourceforge.net/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
 BuildRequires: iptables-devel >= 1.4.5
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
 BuildRequires: iptables-devel >= 1.4.5

-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}

 BuildRequires: libtool
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: rpmbuild(macros) >= 1.678
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: rpmbuild(macros) >= 1.678


@@ -95,10 +90,8 @@ Requires:    %{pname} = %{version}\
 Suggests:      xtables-geoip\
 Conflicts:     xtables-geoip < 20090901-2\
 Requires(post,postun): /sbin/depmod\
 Suggests:      xtables-geoip\
 Conflicts:     xtables-geoip < 20090901-2\
 Requires(post,postun): /sbin/depmod\

-%if %{with dist_kernel}\

 %requires_releq_kernel\
 Requires(postun):      %releq_kernel\
 %requires_releq_kernel\
 Requires(postun):      %releq_kernel\

-%endif\

 \
 %description -n kernel%{_alt_kernel}-net-xtables-addons\
 Kernel modules for xtables addons.\
 \
 %description -n kernel%{_alt_kernel}-net-xtables-addons\
 Kernel modules for xtables addons.\