From 871299b3b29b3de02583bfb7a72309dcf17cd02d Mon Sep 17 00:00:00 2001
From: Paul P Komkoff Jr <stingray@fedoraproject.org>
Date: Jul 16 2008 21:40:28 +0000
Subject: new upstream version


---

diff --git a/.cvsignore b/.cvsignore
index d42be17..8e6977c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-conntrack-tools-0.9.5.tar.bz2
-conntrack-tools-0.9.6-svn7382.patch.bz2
+conntrack-tools-0.9.7.tar.bz2
diff --git a/conntrack-tools-rollup.patch b/conntrack-tools-rollup.patch
index 7c77ad8..5d0c751 100644
--- a/conntrack-tools-rollup.patch
+++ b/conntrack-tools-rollup.patch
@@ -33,19 +33,6 @@ index 494da4f..2d8c6b6 100644
  conntrackd_LDFLAGS = $(all_libraries) @LIBNETFILTER_CONNTRACK_LIBS@
  
 -EXTRA_DIST = read_config_yy.h
-diff --git a/src/conntrack.c b/src/conntrack.c
-index 82ff544..23050a4 100644
---- a/src/conntrack.c
-+++ b/src/conntrack.c
-@@ -299,7 +299,7 @@ err2str(int err, enum action command)
- 	    { CT_CREATE, ETIME, "conntrack has expired" },
- 	    { EXP_CREATE, ENOENT, "master conntrack not found" },
- 	    { EXP_CREATE, EINVAL, "invalid parameters" },
--	    { ~0UL, EPERM, "sorry, you must be root or get "
-+	    { (enum action) ~0UL, EPERM, "sorry, you must be root or get "
- 		    	   "CAP_NET_ADMIN capability to do this"}
- 	  };
- 
 diff --git a/src/ignore_pool.c b/src/ignore_pool.c
 index 027d628..2f951e8 100644
 --- a/src/ignore_pool.c
diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index 06c707d..5fe69e6 100644
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -1,16 +1,12 @@
-%define rev 7382
-%define basever 0.9.5
-
 Name:           conntrack-tools
-Version:        0.9.6
-Release: 0.1.svn%{rev}%{?dist}
+Version:        0.9.7
+Release: 	1%{?dist}
 Summary:        Tools to manipulate netfilter connection tracking table
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://netfilter.org
-Source0:        http://netfilter.org/projects/%{name}/files/%{name}-%{basever}.tar.bz2
-Patch0:         conntrack-tools-%{version}-svn%{rev}.patch.bz2
-Patch1:		conntrack-tools-rollup.patch
+Source0:        http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2
+Patch0:		conntrack-tools-rollup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libnfnetlink-devel libnetfilter_conntrack-devel pkgconfig bison flex
 BuildRequires:  autoconf automake libtool
@@ -34,9 +30,9 @@ In addition, you can also monitor connection tracking events, e.g.
 show an event message (one line) per newly established connection.
 
 %prep
-%setup -q -n %{name}-%{basever}
-%patch0 -p1
-%patch1 -p1
+%setup -q
+%patch -p1
+
 autoreconf -i --force
 
 %build
@@ -58,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 16 2008 Paul P. Komkoff Jr <i@stingr.net> - 0.9.7-1
+- new upstream version
+
 * Sat Feb 23 2008 Paul P. Komkoff Jr <i@stingr.net> - 0.9.6-0.1.svn7382
 - new version from svn
 
diff --git a/sources b/sources
index d8ec799..2f66a0e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c639e17ba6cbfce52b288a5105724f2d  conntrack-tools-0.9.5.tar.bz2
-3655624ced8ef291c90edfdfb9760434  conntrack-tools-0.9.6-svn7382.patch.bz2
+e058b4494ecdf3f8d3c8345eead18d14  conntrack-tools-0.9.7.tar.bz2