From 703b9ea46c6469a13ec512cc6a4a32a5591a8ca0eeffa05a889f9636e86a626c Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 23 Feb 2010 00:18:57 +0000
Subject: [PATCH] Accepting request 33133 from Base:System

Copy from Base:System/iptables based on submit request 33133 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/33133
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iptables?expand=0&rev=19
---
 iptables-1.4.6+git9.tar.bz2 |  3 +++
 iptables-1.4.6.tar.bz2      |  3 ---
 iptables.changes            |  8 ++++++++
 iptables.spec               | 15 ++++++++-------
 4 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 iptables-1.4.6+git9.tar.bz2
 delete mode 100644 iptables-1.4.6.tar.bz2

diff --git a/iptables-1.4.6+git9.tar.bz2 b/iptables-1.4.6+git9.tar.bz2
new file mode 100644
index 0000000..5eba996
--- /dev/null
+++ b/iptables-1.4.6+git9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5fe2361b111d5a8a3b98510a1b913d0dc49b07e4ef6f1a724df136e3e91e88d3
+size 216442
diff --git a/iptables-1.4.6.tar.bz2 b/iptables-1.4.6.tar.bz2
deleted file mode 100644
index 848b71c..0000000
--- a/iptables-1.4.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e732798cad62163d6e033aa52e22b771246556a230c0f66cd33fe69e96d72a4
-size 463758
diff --git a/iptables.changes b/iptables.changes
index e6a19b0..07876c2 100644
--- a/iptables.changes
+++ b/iptables.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Feb 22 13:09:03 UTC 2010 - jengelh@medozas.de
+
+- only run configure when needed
+- use %_smp_mflags
+- use newer git snapshot to fix compile error due to missing
+  ipt_DSCP.h in newer linux-glibc-devel (>= 2.6.32)
+
 -------------------------------------------------------------------
 Wed Dec 30 13:01:52 UTC 2009 - puzel@novell.com
 
diff --git a/iptables.spec b/iptables.spec
index d090af7..cce55dc 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package iptables (Version 1.4.6)
+# spec file for package iptables (Version 1.4.6+git9)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,8 +21,8 @@
 Name:           iptables
 License:        GPLv2+
 Group:          Productivity/Networking/Security
-Version:        1.4.6
-Release:        2
+Version:        1.4.6+git9
+Release:        1
 Summary:        IP Packet Filter Administration
 Source0:        %{name}-%{version}.tar.bz2
 Patch0:         %{name}-batch.patch
@@ -62,20 +62,22 @@ Authors:
 %patch0
 
 %build
-autoreconf -f -i
+if [ ! -e configure ]; then
+	./autogen.sh;
+fi
 # bnc#561793 - do not include unclean module in iptables manpage
 rm -rf extensions/libipt_unclean.man
 %configure \
     --enable-libipq \
     --libexecdir=%{_libdir}
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 # iptables-apply is not installed by upstream Makefile
 install -m0755 iptables-apply $RPM_BUILD_ROOT%{_sbindir}/
 install -m0644 iptables-apply.8 $RPM_BUILD_ROOT%{_mandir}/man8/
-find "$RPM_BUILD_ROOT" -iname "*.la" -print0 | xargs -0 rm -f;
+find "$RPM_BUILD_ROOT" -iname "*.la" -delete
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,7 +101,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc %{_mandir}/man3/*
 %{_includedir}/*
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/xtables.pc
 %{_libdir}/pkgconfig/libiptc.pc