From c3128a56e8ca2a4cb24e305d3cdc605a9d0a046876cae2bc7b2098dc044034b7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 15 Nov 2012 14:17:09 +0000 Subject: [PATCH 1/2] Always regenerate files due to SUSE's iptables-batch patch OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=60 --- iptables.changes | 5 +++++ iptables.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/iptables.changes b/iptables.changes index 8dcdb48..f6f3563 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 15 14:15:48 UTC 2012 - jengelh@inai.de + +- Always regenerate files due to SUSE's iptables-batch patch + ------------------------------------------------------------------- Mon Oct 8 12:42:37 UTC 2012 - jengelh@inai.de diff --git a/iptables.spec b/iptables.spec index 27ba3ce..9503a2a 100644 --- a/iptables.spec +++ b/iptables.spec @@ -141,7 +141,8 @@ tar -xf "%{S:0}" --use=bzip2; %patch -P 1 -P 2 -p1 %build -if [ ! -e configure ]; then +# We have the iptables-batch patch, so always regenerate. +if true || [ ! -e configure ]; then ./autogen.sh; fi # bnc#561793 - do not include unclean module in iptables manpage From 328632a0c4d89682827019b07a7607b8f65dfed3a546e78d27d012d93ddc1373 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 15 Nov 2012 23:26:56 +0000 Subject: [PATCH 2/2] Accepting request 141448 from home:lnussel:branches:OBS_Maintained:iptables - list all required binaries explicitly to make sure all of them are actually compiled OBS-URL: https://build.opensuse.org/request/show/141448 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=61 --- iptables.changes | 6 ++++++ iptables.spec | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/iptables.changes b/iptables.changes index f6f3563..e33ce70 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 15 16:06:15 UTC 2012 - lnussel@suse.de + +- list all required binaries explicitly to make sure all of them are actually + compiled + ------------------------------------------------------------------- Thu Nov 15 14:15:48 UTC 2012 - jengelh@inai.de diff --git a/iptables.spec b/iptables.spec index 9503a2a..fc43238 100644 --- a/iptables.spec +++ b/iptables.spec @@ -179,10 +179,17 @@ rm -f "%buildroot/%_libdir"/*.la; %doc COPYING %doc %_mandir/man1/* %doc %_mandir/man8/* -%_bindir/iptables* -%_sbindir/iptables* -%_sbindir/ip6tables* -%_sbindir/xtables* +%_bindir/iptables-xml +%_sbindir/iptables +%_sbindir/iptables-apply +%_sbindir/iptables-batch +%_sbindir/iptables-restore +%_sbindir/iptables-save +%_sbindir/ip6tables +%_sbindir/ip6tables-batch +%_sbindir/ip6tables-restore +%_sbindir/ip6tables-save +%_sbindir/xtables-multi %_sbindir/nfnl_osf %_libdir/xtables %_datadir/xtables