ateixeira/iptables
SHA256
1
0
Fork 0
forked from jengelh/iptables
Code Pull Requests Activity

Accepting request 231277 from security:netfilter

Browse Source 
- remove dependency on gpg-offline (blocks rebuilds and
  tarball integrity is checked by source-validator anyway) (forwarded request 231251 from dirkmueller)

OBS-URL: https://build.opensuse.org/request/show/231277
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iptables?expand=0&rev=55
This commit is contained in:
Stephan Kulow 2014-04-26 17:33:59 +00:00 committed by Git OBS Bridge
commit 3300824c22
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
iptables.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Apr 24 09:54:12 UTC 2014 - dmueller@suse.com
- remove dependency on gpg-offline (blocks rebuilds and
tarball integrity is checked by source-validator anyway)
-------------------------------------------------------------------
Wed Apr 23 16:20:02 UTC 2014 - dmueller@suse.com
- remove dependency on sgmltool: doesn't seem to be used
and reduces rebuild time on aarch64 by 8 hours
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 23 04:39:31 UTC 2013 - jengelh@inai.de Sat Nov 23 04:39:31 UTC 2013 - jengelh@inai.de

15
iptables.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package iptables # spec file for package iptables
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -38,9 +38,6 @@ Patch3: iptables-batch.patch
Patch4: iptables-apply-mktemp-fix.patch Patch4: iptables-apply-mktemp-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
BuildRequires: sgmltool
%endif
%if 0%{?fedora_version} || 0%{?centos_version} %if 0%{?fedora_version} || 0%{?centos_version}
BuildRequires: sgml-common BuildRequires: sgml-common
%endif %endif
@ -50,15 +47,12 @@ BuildRequires: pkgconfig >= 0.21
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: fdupes BuildRequires: fdupes
%endif %endif
%if 0%{?suse_version} >= 1230 %if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
BuildRequires: gpg-offline
%endif
%if 0%{?suse_version} >= 1140
BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.4 BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.4
BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0
%endif %endif
%if (0%{?suse_version} && 0%{?suse_version} <= 1110) || 0%{?fedora_version} || 0%{?centos_version} || 0%{?redhat_version} %if (0%{?suse_version} && 0%{?suse_version} <= 1110) || 0%{?centos_version} || 0%{?redhat_version}
BuildRequires: libnetfilter_conntrack >= 1.0.4 BuildRequires: libnetfilter_conntrack-devel >= 1.0.4
BuildRequires: libnfnetlink-devel >= 1.0.0 BuildRequires: libnfnetlink-devel >= 1.0.0
%endif %endif
Requires: xtables-plugins = %version Requires: xtables-plugins = %version
@ -143,7 +137,6 @@ Link your extension (iptables plugins) with $(pkg-config xtables
xtables --variable=xtlibdir). xtables --variable=xtlibdir).
%prep %prep
%{?gpg_verify: %gpg_verify %{S:2}}
%setup -q %setup -q
%patch -P 3 -P 4 -p1 %patch -P 3 -P 4 -p1