Author: gotar Date: Mon Mar 23 15:57:11 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- separated kernel modules package (one can have multiple kernels with
single common tools, or no dist_kernel at all), release 2,
- some template-kernel-module.spec merges.
---- Files affected:
SPECS:
xtables-addons.spec (1.27 -> 1.28)
---- Diffs:
================================================================
Index: SPECS/xtables-addons.spec
diff -u SPECS/xtables-addons.spec:1.27 SPECS/xtables-addons.spec:1.28
--- SPECS/xtables-addons.spec:1.27 Fri Mar 20 23:35:33 2009
+++ SPECS/xtables-addons.spec Mon Mar 23 16:57:05 2009
@@ -1,15 +1,27 @@
# $Revision$, $Date$
#
# TODO
-# - kernel modules package (or not, 2 packages with mutual R?)
# - descriptions
#
# Conditional build:
%bcond_without dist_kernel # without distribution kernel
-%bcond_without kernel
-%bcond_without userspace
+%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
+%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 1
+%define rel 2
Summary: Extensible packet filtering system && extensible NAT system
Summary(pl.UTF-8): System filtrowania pakietów oraz system translacji
adresów (NAT)
Summary(pt_BR.UTF-8): Ferramenta para controlar a filtragem de pacotes no
kernel-2.6.x
@@ -18,9 +30,9 @@
Summary(zh_CN.UTF-8): Linux内核包过滤管理工具
Name: xtables-addons
Version: 1.12
-Release: %{r...@%{_kernel_ver_str}
+Release: %{rel}
License: GPL
-Group: Networking/Daemons
+Group: Networking/Admin
Source0:
http://dl.sourceforge.net/xtables-addons/%{name}-%{version}.tar.bz2
# Source0-md5: e1544d87bbae03a02874c6598daa111d
URL: http://xtables-addons.sourceforge.net/
@@ -32,8 +44,6 @@
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.25}
BuildRequires: libtool
BuildRequires: rpmbuild(macros) >= 1.379
-%{?with_dist_kernel:%requires_releq_kernel}
-Requires(post,postun): /sbin/depmod
Requires: iptables >= 1.4.1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,6 +71,17 @@
Linux. Вони дозволяють вам встановлювати міжмережеві екрани
(firewalls) та IP маскарадинг, тощо.
+%package -n kernel%{_alt_kernel}-net-xtables-addons
+Summary: -
+Summary(pl.UTF-8): -
+Release: %{relea...@%{_kernel_ver_str}
+Group: Base/Kernel
+Requires: %{name} = %{version}-%{rel}
+%{?with_dist_kernel:%requires_releq_kernel}
+Requires(post,postun): /sbin/depmod
+
+%description -n kernel%{_alt_kernel}-net-xtables-addons
+
%prep
%setup -q
%patch0 -p1
@@ -112,15 +133,15 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post
+%post -n kernel%{_alt_kernel}-net-xtables-addons
%depmod %{_kernel_ver}
-%postun
+%postun -n kernel%{_alt_kernel}-net-xtables-addons
%depmod %{_kernel_ver}
+%if %{with userspace}
%files
%defattr(644,root,root,755)
-%if %{with userspace}
%attr(755,root,root) %{_libdir}/xtables/libxt_CHAOS.so
%attr(755,root,root) %{_libdir}/xtables/libxt_DELUDE.so
%attr(755,root,root) %{_libdir}/xtables/libxt_DHCPADDR.so
@@ -154,9 +175,11 @@
%{_mandir}/man8/libxt_lscan.*
%{_mandir}/man8/libxt_quota2.*
%{_mandir}/man8/libxt_length.8*
-
%endif
+
%if %{with kernel}
+%files -n kernel%{_alt_kernel}-net-xtables-addons
+%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/kernel/net/netfilter/compat_xtables.ko.gz
/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_CHAOS.ko.gz
/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_DELUDE.ko.gz
@@ -181,6 +204,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.28 2009/03/23 15:57:05 gotar
+- separated kernel modules package (one can have multiple kernels with
+ single common tools, or no dist_kernel at all), release 2,
+- some template-kernel-module.spec merges.
+
Revision 1.27 2009/03/20 22:35:33 areq
- 1.12
- new URL
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xtables-addons.spec?r1=1.27&r2=1.28&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
