X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xtables-addons.spec;h=e05345e5274998834632a68de2ab320c0eeac11f;hb=84f3b536c58607516afe05753c3b0c39d4615057;hp=42844a4b70de3a4a48cec60000950d3d74348b28;hpb=5029de89f6fec9077c707b3f9d7c8633193ddaac;p=packages%2Fxtables-addons.git

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 42844a4..e05345e 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -10,15 +10,12 @@
 %if %{without kernel}
 %undefine	with_dist_kernel
 %endif
-%if "%{_alt_kernel}" != "%{nil}"
-%undefine	with_userspace
-%endif
 %if %{without userspace}
 # nothing to be placed to debuginfo package
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	15
+%define		rel	27
 %define		pname	xtables-addons
 Summary:	Additional extensions for xtables packet filtering system
 Summary(pl.UTF-8):	Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables
@@ -41,6 +38,8 @@ BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	tar >= 1.22
 BuildRequires:	xz
 Requires:	iptables >= 1.4.5
+Provides:	xtables-addons = %{version}-%{release}
+Obsoletes:	xtables-addons < %{version}-%{release}
 Obsoletes:	iptables-ipp2p
 BuildRoot:	%{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
@@ -108,19 +107,19 @@ srcdir=${PWD:-$(pwd)}
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT{/etc/modprobe.d,/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter}
-cd extensions
-install iptable_rawpost.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter
-%install_kernel_modules -m compat_xtables -d kernel/net/netfilter
-install -p {ACCOUNT/,pknock/,}xt_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/netfilter
-cd ..
+%install_kernel_modules -m extensions/iptable_rawpost -d kernel/net/ipv4/netfilter
+for drv in extensions/compat_xtables.ko extensions/{ACCOUNT/,pknock/,}xt_*.ko ; do
+%install_kernel_modules -m ${drv%.ko} -d kernel/net/netfilter
+done
 
+install -d $RPM_BUILD_ROOT/etc/modprobe.d
 cat <<'EOF' > $RPM_BUILD_ROOT/etc/modprobe.d/xt_sysrq.conf
 # Set password at modprobe time. This file is secure if properly guarded,
 # i.e only readable by root.
 #options xt_SYSRQ password=cookies
 
-# The hash algorithm can also be specified as a module option, for example, to use SHA-256 instead of the default SHA-1:
+# The hash algorithm can also be specified as a module option, for example,
+# to use SHA-256 instead of the default SHA-1:
 #options xt_SYSRQ hash=sha256
 EOF
 %endif