From 10d28dceee35f2108535f4926909eebc8449eabf07a3d0d521e867cc370e4c26 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 9 Jan 2014 11:22:59 +0000 Subject: [PATCH 1/5] Resolve BuildRequires for old distro OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=80 --- iptables.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iptables.spec b/iptables.spec index 8e0efd6..623a063 100644 --- a/iptables.spec +++ b/iptables.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -58,7 +58,7 @@ BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.4 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 %endif %if (0%{?suse_version} && 0%{?suse_version} <= 1110) || 0%{?fedora_version} || 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 %endif Requires: xtables-plugins = %version From e0c4e623172790777fd2b0f34925dcde212ec1f1622c871d0fae0f535a5b26a2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 9 Jan 2014 11:23:33 +0000 Subject: [PATCH 2/5] Resolve BuildRequires for old distro OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=81 --- iptables.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iptables.spec b/iptables.spec index 623a063..2a302ff 100644 --- a/iptables.spec +++ b/iptables.spec @@ -57,7 +57,7 @@ BuildRequires: gpg-offline BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.4 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 %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-devel >= 1.0.4 BuildRequires: libnfnetlink-devel >= 1.0.0 %endif From ac6a378cbb29c92db58a9bf8e7d17532278cec0477e991f67b14684327f7480a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 9 Jan 2014 12:46:18 +0000 Subject: [PATCH 3/5] Fedora deps OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=82 --- iptables.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iptables.spec b/iptables.spec index 2a302ff..4e9b272 100644 --- a/iptables.spec +++ b/iptables.spec @@ -53,7 +53,7 @@ BuildRequires: fdupes %if 0%{?suse_version} >= 1230 BuildRequires: gpg-offline %endif -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.4 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 %endif From ba65329d38649b40b9f471b4b7a9e8f8ba1a868d813e29268a35c325c63800c6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 23 Apr 2014 17:01:35 +0000 Subject: [PATCH 4/5] Accepting request 231182 from home:dirkmueller:branches:security:netfilter - remove dependency on sgmltool: doesn't seem to be used and reduces rebuild time on aarch64 by 8 hours OBS-URL: https://build.opensuse.org/request/show/231182 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=83 --- iptables.changes | 6 ++++++ iptables.spec | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/iptables.changes b/iptables.changes index 5fb2331..dfc69f9 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/iptables.spec b/iptables.spec index 4e9b272..cc8e83a 100644 --- a/iptables.spec +++ b/iptables.spec @@ -38,9 +38,6 @@ Patch3: iptables-batch.patch Patch4: iptables-apply-mktemp-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} -BuildRequires: sgmltool -%endif %if 0%{?fedora_version} || 0%{?centos_version} BuildRequires: sgml-common %endif From d73ca7affd5c22f380d1ff6ca9656fa39f7eae38c661fe676fc5b78b34349400 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 24 Apr 2014 21:15:59 +0000 Subject: [PATCH 5/5] Accepting request 231251 from home:dirkmueller:branches:security:netfilter - remove dependency on gpg-offline (blocks rebuilds and tarball integrity is checked by source-validator anyway) OBS-URL: https://build.opensuse.org/request/show/231251 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=84 --- iptables.changes | 6 ++++++ iptables.spec | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/iptables.changes b/iptables.changes index dfc69f9..810b49e 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/iptables.spec b/iptables.spec index cc8e83a..d5f8882 100644 --- a/iptables.spec +++ b/iptables.spec @@ -47,9 +47,6 @@ BuildRequires: pkgconfig >= 0.21 %if 0%{?suse_version} BuildRequires: fdupes %endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.4 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0 @@ -140,7 +137,6 @@ Link your extension (iptables plugins) with $(pkg-config xtables xtables --variable=xtlibdir). %prep -%{?gpg_verify: %gpg_verify %{S:2}} %setup -q %patch -P 3 -P 4 -p1