[netsniff-ng] fix build on secondary arches

[Dan Horák]

commit 53b8aae70bd77ca0755cab863544a36153deaa85
Author: Dan Horák <dan at danny.cz>
Date:   Mon Jul 30 16:03:58 2012 +0200

    fix build on secondary arches

 netsniff-ng-0.5.7-flags.patch |   12 ++++++++++++
 netsniff-ng.spec              |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/netsniff-ng-0.5.7-flags.patch b/netsniff-ng-0.5.7-flags.patch
new file mode 100644
index 0000000..1b3b786
--- /dev/null
+++ b/netsniff-ng-0.5.7-flags.patch
@@ -0,0 +1,12 @@
+diff -up netsniff-ng-0.5.7/src/CMakeLists.txt.orig netsniff-ng-0.5.7/src/CMakeLists.txt
+--- netsniff-ng-0.5.7/src/CMakeLists.txt.orig	2012-07-30 15:54:43.000000000 +0200
++++ netsniff-ng-0.5.7/src/CMakeLists.txt	2012-07-30 15:54:47.000000000 +0200
+@@ -22,8 +22,6 @@ ADD_DEFINITIONS(
+ 	-fno-strict-aliasing
+ 	-D_FORTIFY_SOURCE=2
+ 	-D_REENTRANT
+-	-march=native
+-	-mtune=native
+ 	-Wall
+ 	-Wundef
+ 	-Wstrict-prototypes
diff --git a/netsniff-ng.spec b/netsniff-ng.spec
index 64279ff..844600a 100644
--- a/netsniff-ng.spec
+++ b/netsniff-ng.spec
@@ -2,7 +2,7 @@
 
 Name:		netsniff-ng
 Version:	0.5.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A high performance network sniffer for packet inspection
 Group:		Applications/Internet
 License:	GPLv2+
@@ -10,6 +10,8 @@ URL:		http://netsniff-ng.org/
 Source0:	http://www.netsniff-ng.org/pub/netsniff-ng/netsniff-ng-%{version}.tar.gz
 # Temporal workaround for rhbz#836923
 Patch0:	netsniff-ng-0.5.7-libcli-include-fix.patch
+# drop -march/-mtune=native (breaks binaries and doesn't work on all arches)
+Patch1:	netsniff-ng-0.5.7-flags.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	cmake ncurses-devel GeoIP-devel libnetfilter_conntrack-devel
 BuildRequires:	userspace-rcu-devel libnl-devel libcli-devel flex bison
@@ -40,6 +42,7 @@ fi
 %prep
 %setup -q
 %patch0 -p1 -b .libcli-include-fix
+%patch1 -p1 -b .flags
 
 %if "%{with_nacl}" == "yes"
 [ -r src/curvetun/nacl_path.cmake ] || \
@@ -73,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
+* Mon Jul 30 2012 Dan Horák <dan[at]danny.cz> - 0.5.7-3
+- fix build on secondary arches
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild