Author: glen Date: Thu Nov 8 17:37:19 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- remove kernel_ver str from release, just confusing people as there's no
strict dep with it; rel 17
---- Files affected:
SPECS:
iptables.spec (1.189.2.11 -> 1.189.2.12)
---- Diffs:
================================================================
Index: SPECS/iptables.spec
diff -u SPECS/iptables.spec:1.189.2.11 SPECS/iptables.spec:1.189.2.12
--- SPECS/iptables.spec:1.189.2.11 Thu Nov 8 18:27:53 2007
+++ SPECS/iptables.spec Thu Nov 8 18:37:14 2007
@@ -12,6 +12,7 @@
%define iptables_version 1.3.3
%define llh_version 7:2.6.13.0-1
%define name6 ip6tables
+%define _rel 17
#
Summary: Extensible packet filtering system && extensible NAT system
Summary(pl): System filtrowania pakiet�w oraz system translacji adres�w (NAT)
@@ -21,8 +22,7 @@
Summary(zh_CN): Linux�ں˰����˹�������
Name: iptables
Version: %{iptables_version}
-%define _rel 16
-Release: [EMAIL PROTECTED]
+Release: %{_rel}
License: GPL
Group: Networking/Daemons
Source0: http://netfilter.org/files/%{name}-%{version}.tar.bz2
@@ -31,13 +31,12 @@
# Source1-md5: 2ed2b452daefe70ededd75dc0061fd07
Source2: %{name}.init
Source3: %{name6}.init
-#Patch0: %{name}-pom-ng-branch.diff
+#Patch0: %{name}-pom-ng-branch.diff
Patch1: %{name}-Makefile.patch
Patch2: %{name}-1.3.0-imq1.diff
-Patch3: grsecurity-1.2.11-iptables.patch
+Patch3: grsecurity-1.2.11-%{name}.patch
Patch4: %{name}-man.patch
Patch5: %{name}-64bit_connmark_fix.patch
-
# patch-o-matic-ng
# [submitted]
Patch10: %{name}-nf-comment.patch
@@ -51,21 +50,17 @@
Patch16: %{name}-nf-ipp2p.patch
Patch17: %{name}-nf-ip_queue_vwmark.patch
Patch18: %{name}-nf-policy.patch
-
Patch20: %{name}-hot_dirty_fix.patch
-
Patch21: %{name}-layer7-2.1.patch
-
URL: http://www.netfilter.org/
-Vendor: Netfilter mailing list <[EMAIL PROTECTED]>
%if %{with doc}
+BuildRequires: sed >= 4.0
BuildRequires: sgml-tools
BuildRequires: sgmls
BuildRequires: tetex-dvips
BuildRequires: tetex-format-latex
BuildRequires: tetex-latex
BuildRequires: tetex-tex-babel
-BuildRequires: sed >= 4.0
%endif
%if %{with dist_kernel} && %{_pomng_snap} != 0
BuildRequires: kernel-headers(netfilter) >= %{_pomng_snap}
@@ -75,10 +70,10 @@
#BuildRequires: linux-libc-headers >= %{llh_version}
BuildConflicts: kernel-headers < 2.3.0
Provides: firewall-userspace-tool
-Obsoletes: netfilter
Obsoletes: ipchains
Obsoletes: iptables-ipp2p
Obsoletes: iptables24-compat
+Obsoletes: netfilter
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -121,11 +116,11 @@
%package init
Summary: Iptables init (RedHat style)
Summary(pl): Iptables init (w stylu RedHata)
-Group: Networking/Admin
Release: %{_rel}
-PreReq: rc-scripts
+Group: Networking/Admin
Requires(post,preun): /sbin/chkconfig
Requires: %{name}
+Requires: rc-scripts
Obsoletes: firewall-init
Obsoletes: firewall-init-ipchains
Obsoletes: iptables24-init
@@ -147,7 +142,6 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-
%patch10 -p1
%patch11 -p1
%patch12 -p1
@@ -157,7 +151,6 @@
%patch16 -p1
#%patch17 -p1
%patch18 -p1
-
%patch20 -p1
%patch21 -p1
@@ -243,6 +236,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.189.2.12 2007-11-08 17:37:14 glen
+- remove kernel_ver str from release, just confusing people as there's no
strict dep with it; rel 17
+
Revision 1.189.2.11 2007-11-08 17:27:53 hawk
- release 16
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/iptables.spec?r1=1.189.2.11&r2=1.189.2.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
