[netsniff-ng] New version

[Jaroslav Škarvada]

commit 00d113c1ab018c8cde49ce3f075359a90b1053af
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Jul 2 10:19:01 2012 +0200

    New version
    
      Resolves: rhbz#836707
    - Added missing build requires (NaCl is not in Fedora yet, not using
      the bundled version, thus built without curvetun)

 netsniff-ng-0.5.7-libcli-include-fix.patch |    8 ++++++++
 netsniff-ng.spec                           |   19 ++++++++++++++-----
 sources                                    |    2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/netsniff-ng-0.5.7-libcli-include-fix.patch b/netsniff-ng-0.5.7-libcli-include-fix.patch
new file mode 100644
index 0000000..7f2b147
--- /dev/null
+++ b/netsniff-ng-0.5.7-libcli-include-fix.patch
@@ -0,0 +1,8 @@
+diff -up netsniff-ng-0.5.7/src/trafgen_cli.c.orig netsniff-ng-0.5.7/src/trafgen_cli.c
+--- netsniff-ng-0.5.7/src/trafgen_cli.c.orig	2012-06-29 20:07:57.000000000 +0200
++++ netsniff-ng-0.5.7/src/trafgen_cli.c	2012-07-02 10:01:52.324609913 +0200
+@@ -1,3 +1,4 @@
++#include <sys/time.h>
+ #include <libcli.h>
+ 
+ #include "trafgen_conf.h"
diff --git a/netsniff-ng.spec b/netsniff-ng.spec
index f1e2be1..48d2ea7 100644
--- a/netsniff-ng.spec
+++ b/netsniff-ng.spec
@@ -1,13 +1,16 @@
 Name:		netsniff-ng
-Version:	0.5.6
-Release:	2%{?dist}
+Version:	0.5.7
+Release:	1%{?dist}
 Summary:	A high performance network sniffer for packet inspection
 Group:		Applications/Internet
 License:	GPLv2+
 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
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:	cmake
+BuildRequires:	cmake ncurses-devel GeoIP-devel libnetfilter_conntrack-devel
+BuildRequires:	userspace-rcu-devel libnl-devel libcli-devel flex bison
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
@@ -31,6 +34,7 @@ fi
 
 %prep
 %setup -q
+%patch0 -p1 -b .libcli-include-fix
 
 %build
 cd src
@@ -49,14 +53,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING README THANKS
+%doc AUTHORS COPYING README
 %{_sbindir}/*
 %dir %{_sysconfdir}/%{name}
-%dir %{_sysconfdir}/%{name}/rules
 %config(noreplace) %{_sysconfdir}/%{name}/*
 %{_mandir}/man8/*
 
 %changelog
+* Mon Jul  2 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 0.5.7-1
+- New version
+  Resolves: rhbz#836707
+- Added missing build requires (NaCl is not in Fedora yet, not using
+  the bundled version, thus built without curvetun)
+
 * Tue Apr 24 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 0.5.6-2
 - Built with RPM_OPT_FLAGS
   Resolves: rhbz#815476
diff --git a/sources b/sources
index f2d3696..021b629 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9db3d2027c1f59437890f637178c1a02  netsniff-ng-0.5.6.tar.gz
+d2da7a75d163f839129c9ebb8b0004d0  netsniff-ng-0.5.7.tar.gz