From 3f485ce38f33f61828584a709d2c7a53325200ba Mon Sep 17 00:00:00 2001
From: Paul P. Komkoff <i@stingr.net>
Date: Nov 30 2012 01:01:57 +0000
Subject: conntrack-tools-1.4.0-1


---

diff --git a/.gitignore b/.gitignore
index f6f2be9..54f00c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ conntrack-tools-0.9.14.tar.bz2
 /conntrack-tools-0.9.15.tar.bz2
 /conntrack-tools-1.0.0.tar.bz2
 /conntrack-tools-1.0.1.tar.bz2
+/conntrack-tools-1.4.0.tar.bz2
diff --git a/conntrack-tools-NULL.patch b/conntrack-tools-NULL.patch
deleted file mode 100644
index 1c5d927..0000000
--- a/conntrack-tools-NULL.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur conntrack-tools-1.0.1-orig/src/parse.c conntrack-tools-1.0.1/src/parse.c
---- conntrack-tools-1.0.1-orig/src/parse.c	2012-01-04 11:48:15.490258748 -0500
-+++ conntrack-tools-1.0.1/src/parse.c	2012-05-07 22:49:51.590626617 -0400
-@@ -16,6 +16,9 @@
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+/* for NULL :P */
-+#include <stddef.h>
-+
- #include "network.h"
- 
- #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index 88d8be1..7825c15 100644
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -1,6 +1,6 @@
 Name:           conntrack-tools
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        Manipulate netfilter connection tracking table and run High Availability
 Group:          System Environment/Base
 License:        GPLv2
@@ -8,8 +8,9 @@ URL:            http://netfilter.org
 Source0:        http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2
 Source1:        conntrackd.service
 Source2:        conntrackd.conf
-Patch1:         conntrack-tools-NULL.patch
-BuildRequires:  libnfnetlink-devel >= 1.0.0, libnetfilter_conntrack-devel >= 0.9.1
+BuildRequires:  libnfnetlink-devel >= 1.0.1, libnetfilter_conntrack-devel >= 1.0.2
+BuildRequires:  libnetfilter_cttimeout-devel >= 1.0.0, libnetfilter_cthelper-devel >= 1.0.0
+BuildRequires:  libmnl-devel >= 1.0.3, libnetfilter_queue-devel >= 1.0.2
 BuildRequires:  pkgconfig bison flex
 Provides:       conntrack = 1.0-1
 Obsoletes:      conntrack < 1.0-1
@@ -40,7 +41,6 @@ show an event message (one line) per newly established connection.
 
 %prep
 %setup -q
-%patch1 -p1 
 
 %build
 %configure --disable-static
@@ -49,6 +49,7 @@ chmod 644 doc/sync/primary-backup.sh
 
 %install
 %{__make} install DESTDIR=%{buildroot}
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 mkdir -p %{buildroot}%{_sysconfdir}/conntrackd
 install -d 0755 %{buildroot}%{_unitdir}
 install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/
@@ -61,7 +62,10 @@ install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conntrackd/
 %{_unitdir}/conntrackd.service
 %{_sbindir}/conntrack
 %{_sbindir}/conntrackd
+%{_sbindir}/nfct
 %{_mandir}/man8/*
+%dir %{_libdir}/conntrack-tools
+%{_libdir}/conntrack-tools/*
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -78,6 +82,12 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Mon Nov 26 2012 Paul P. Komkoff Jr <i@stingr.net> - 1.4.0-1
+- new upstream version
+
+* Tue Jul 24 2012 Paul P. Komkoff Jr <i@stingr.net> - 1.2.1
+- new upstream version
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 4b93ca2..473dc7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a60f02a177fc31fe40cc992c4de90e2  conntrack-tools-1.0.1.tar.bz2
+ee737c774e01349f75e935228a2d851b  conntrack-tools-1.4.0.tar.bz2