- updated to 1.4.4

- removed obsolete patches

diff --git a/conntrack-tools-include.patch b/conntrack-tools-include.patch
deleted file mode 100644 (file)
index b637ad0..0000000
--- a/conntrack-tools-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- conntrack-tools-1.2.0/src/parse.c.orig     2012-05-17 16:21:01.297929729 +0200
-+++ conntrack-tools-1.2.0/src/parse.c  2012-05-27 10:57:22.129982817 +0200
-@@ -20,6 +20,7 @@
- #include "network.h"
- 
- #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-+#include <stdlib.h>
- 
- #ifndef ssizeof
- #define ssizeof(x) (int)sizeof(x)

diff --git a/conntrack-tools-limits.patch b/conntrack-tools-limits.patch
deleted file mode 100644 (file)
index 09ad7d6..0000000
--- a/conntrack-tools-limits.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -burNp conntrack-tools-0.9.11/src/mcast.c conntrack-tools-0.9.11-dud/src/mcast.c
---- conntrack-tools-0.9.11/src/mcast.c 2009-02-21 14:04:43.000000000 +0100
-+++ conntrack-tools-0.9.11-dud/src/mcast.c     2009-03-18 18:49:00.398734264 +0100
-@@ -29,6 +29,7 @@
- #include <net/if.h>
- #include <errno.h>
- #include <libnfnetlink/libnfnetlink.h>
-+#include <limits.h>
- 
- struct mcast_sock *mcast_server_create(struct mcast_conf *conf)
- {
-diff -burNp conntrack-tools-0.9.11/src/sync-mode.c conntrack-tools-0.9.11-dud/src/sync-mode.c
---- conntrack-tools-0.9.11/src/sync-mode.c     2009-02-20 20:42:24.000000000 +0100
-+++ conntrack-tools-0.9.11-dud/src/sync-mode.c 2009-03-18 18:49:27.525299013 +0100
-@@ -28,6 +28,7 @@
- #include "queue.h"
- 
- #include <errno.h>
-+#include <limits.h>
- #include <unistd.h>
- #include <time.h>
- #include <string.h>

diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index 097c0879bdd04e6a71211285907cf55be83dd25d..4e3967df1c38bf0cdf65727a2c6690e526c08729 100644 (file)
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -1,24 +1,26 @@
+#
+# Conditional build:
+%bcond_with    systemd         # systemd integration (requires >= 227)
+#
 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.4.3
+Version:       1.4.4
 Release:       1
 License:       GPL v2
 Group:         Applications/Networking
 Source0:       http://www.netfilter.org/projects/conntrack-tools/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 966a5d8f846ddf5304bcd12685c0707f
+# Source0-md5: acd9e0b27cf16ae3092ba900e4d7560e
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.conf
-Patch0:                %{name}-limits.patch
-Patch1:                %{name}-include.patch
 URL:           http://conntrack-tools.netfilter.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1.6
 BuildRequires: bison
 BuildRequires: flex >= 2.5.33
 BuildRequires: libmnl-devel >= 1.0.3
-BuildRequires: libnetfilter_conntrack-devel >= 1.0.4
+BuildRequires: libnetfilter_conntrack-devel >= 1.0.6
 BuildRequires: libnetfilter_cthelper-devel >= 1.0.0
 BuildRequires: libnetfilter_cttimeout-devel >= 1.0.0
 BuildRequires: libnetfilter_queue-devel >= 1.0.2
@@ -26,13 +28,15 @@ BuildRequires:      libnfnetlink-devel >= 1.0.1
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.228
+%{?with_systemd:BuildRequires: systemd-devel >= 1:227}
 Requires(post,preun):  /sbin/chkconfig
 Requires:      libmnl >= 1.0.3
-Requires:      libnetfilter_conntrack >= 1.0.4
+Requires:      libnetfilter_conntrack >= 1.0.6
 Requires:      libnetfilter_cthelper >= 1.0.0
 Requires:      libnetfilter_cttimeout >= 1.0.0
 Requires:      libnetfilter_queue >= 1.0.2
 Requires:      libnfnetlink >= 1.0.1
+%{?with_systemd:Requires:      systemd-libs >= 1:227}
 Obsoletes:     conntrack
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -61,8 +65,6 @@ statystyk.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -118,6 +120,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conntrackd/conntrackd.conf
 %attr(754,root,root) /etc/rc.d/init.d/conntrackd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/conntrackd
+%{_mandir}/man5/conntrackd.conf.5*
 %{_mandir}/man8/conntrack.8*
 %{_mandir}/man8/conntrackd.8*
 %{_mandir}/man8/nfct.8*