rpms/conntrack-tools/F-9 .cvsignore, 1.3, 1.4 conntrack-tools-rollup.patch, 1.1, 1.2 conntrack-tools.spec, 1.4, 1.5 sources, 1.3, 1.4

[Paul P Komkoff Jr]

Author: stingray

Update of /cvs/extras/rpms/conntrack-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12414

Modified Files:
	.cvsignore conntrack-tools-rollup.patch conntrack-tools.spec 
	sources 
Log Message:
conntrack-tools-0.9.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/conntrack-tools/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Feb 2008 04:14:49 -0000	1.3
+++ .cvsignore	26 Oct 2008 16:45:42 -0000	1.4
@@ -1,2 +1 @@
-conntrack-tools-0.9.5.tar.bz2
-conntrack-tools-0.9.6-svn7382.patch.bz2
+conntrack-tools-0.9.8.tar.bz2

conntrack-tools-rollup.patch:

Index: conntrack-tools-rollup.patch
===================================================================
RCS file: /cvs/extras/rpms/conntrack-tools/F-9/conntrack-tools-rollup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conntrack-tools-rollup.patch	23 Feb 2008 04:14:49 -0000	1.1
+++ conntrack-tools-rollup.patch	26 Oct 2008 16:45:42 -0000	1.2
@@ -33,19 +33,6 @@
  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


Index: conntrack-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/conntrack-tools/F-9/conntrack-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- conntrack-tools.spec	23 Feb 2008 04:14:49 -0000	1.4
+++ conntrack-tools.spec	26 Oct 2008 16:45:42 -0000	1.5
@@ -1,19 +1,14 @@
-%define rev 7382
-%define basever 0.9.5
-
 Name:           conntrack-tools
-Version:        0.9.6
-Release: 0.1.svn%{rev}%{?dist}
+Version:        0.9.8
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libnfnetlink-devel libnetfilter_conntrack-devel pkgconfig bison flex
-BuildRequires:  autoconf automake libtool
+BuildRequires:  libnfnetlink-devel >= 0.0.33, libnetfilter_conntrack-devel >= 0.0.97
+BuildRequires:	pkgconfig bison flex
 Provides:       conntrack = 1.0-1
 Obsoletes:      conntrack < 1.0-1
 
@@ -34,10 +29,7 @@
 show an event message (one line) per newly established connection.
 
 %prep
-%setup -q -n %{name}-%{basever}
-%patch0 -p1
-%patch1 -p1
-autoreconf -i --force
+%setup -q
 
 %build
 %configure --disable-static
@@ -58,6 +50,16 @@
 %{_mandir}/man8/*
 
 %changelog
+* Sun Oct 26 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.9.8-1
+- new upstream version
+- remove rollup patch
+
+* Wed Jul 16 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.9.7-2
+- fix Patch0/%patch.
+
+* Wed Jul 16 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.9.7-1
+- new upstream version
+
 * Sat Feb 23 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.9.6-0.1.svn7382
 - new version from svn
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/conntrack-tools/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Feb 2008 04:14:49 -0000	1.3
+++ sources	26 Oct 2008 16:45:42 -0000	1.4
@@ -1,2 +1 @@
-c639e17ba6cbfce52b288a5105724f2d  conntrack-tools-0.9.5.tar.bz2
-3655624ced8ef291c90edfdfb9760434  conntrack-tools-0.9.6-svn7382.patch.bz2
+faa795dca2b2765e11dd15e1b0b5b6df  conntrack-tools-0.9.8.tar.bz2