- updated to 1.2.1

- removed obsolete timeout patch

Changed files:
    conntrack-tools-timeout.patch -> 1.2
    conntrack-tools.spec -> 1.28

diff --git a/conntrack-tools-timeout.patch b/conntrack-tools-timeout.patch
deleted file mode 100644 (file)
index f9297ec..0000000
--- a/conntrack-tools-timeout.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- conntrack-tools-1.2.0/src/nfct-extensions/timeout.c.orig   2012-05-26 15:53:14.933950376 +0200
-+++ conntrack-tools-1.2.0/src/nfct-extensions/timeout.c        2012-05-27 12:02:29.216485520 +0200
-@@ -96,7 +96,7 @@
-               goto err_free;
-       }
- 
--      nfct_timeout_snprintf(buf, sizeof(buf), t, 0);
-+      nfct_timeout_snprintf(buf, sizeof(buf), t, 0, 0);
-       printf("%s\n", buf);
- 
- err_free:

diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index 16aec0dc700b24452b3fad010c795b3bdfbb6d6f..c799db1afdfa5ac52e5e8ecbc3cf8d799962bb61 100644 (file)
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -1,18 +1,17 @@
 Summary:       The userspace connection tracking table administration program
 Summary(pl.UTF-8):     Program przestrzeni użytkownika do zarządzania tablicą śledzenia połączeń
 Name:          conntrack-tools
 Summary:       The userspace connection tracking table administration program
 Summary(pl.UTF-8):     Program przestrzeni użytkownika do zarządzania tablicą śledzenia połączeń
 Name:          conntrack-tools

-Version:       1.2.0
+Version:       1.2.1

 Release:       1
 License:       GPL v2
 Group:         Applications/Networking
 Source0:       http://www.netfilter.org/projects/conntrack-tools/files/%{name}-%{version}.tar.bz2
 Release:       1
 License:       GPL v2
 Group:         Applications/Networking
 Source0:       http://www.netfilter.org/projects/conntrack-tools/files/%{name}-%{version}.tar.bz2

-# Source0-md5: 8e20330d6ca3a3f23552aa900b1d467c
+# Source0-md5: 48d414cb7a354001babf184ae6c16db9

 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.conf
 Patch0:                %{name}-limits.patch
 Patch1:                %{name}-include.patch
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.conf
 Patch0:                %{name}-limits.patch
 Patch1:                %{name}-include.patch

-Patch2:                %{name}-timeout.patch

 URL:           http://conntrack-tools.netfilter.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1.6
 URL:           http://conntrack-tools.netfilter.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1.6


@@ -60,7 +59,6 @@ statystyk.
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %setup -q
 %patch0 -p1
 %patch1 -p1

-%patch2 -p1

 
 %build
 %{__libtoolize}
 
 %build
 %{__libtoolize}