X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=conntrack-tools.spec;h=c799db1afdfa5ac52e5e8ecbc3cf8d799962bb61;hb=d24792fd051c30972533a46641c7d95d2f243ee7;hp=178d75a8b02696c0a3e4e898216e9cbb91514a28;hpb=daac0118f3df1b7f528d8af683df2e41a1673386;p=packages%2Fconntrack-tools.git

diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index 178d75a..c799db1 100644
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -1,28 +1,33 @@
 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:	0.9.15
+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
-# Source0-md5:	caecb479ceb5ff7f646d47e85484d655
+# Source0-md5:	48d414cb7a354001babf184ae6c16db9
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.conf
 Patch0:		%{name}-limits.patch
-URL:		http://people.netfilter.org/pablo/conntrack-tools/
-BuildRequires:	autoconf
+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:	libnetfilter_conntrack-devel >= 0.0.102
+BuildRequires:	libmnl-devel >= 1.0.0
+BuildRequires:	libnetfilter_conntrack-devel >= 1.0.1
+BuildRequires:	libnetfilter_cttimeout-devel >= 1.0.0
 BuildRequires:	libnfnetlink-devel >= 1.0.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.228
 Requires(post,preun):	/sbin/chkconfig
-Requires:	libnetfilter_conntrack >= 0.0.101
+Requires:	libmnl >= 1.0.0
+Requires:	libnetfilter_conntrack >= 1.0.1
+Requires:	libnetfilter_cttimeout >= 1.0.0
 Requires:	libnfnetlink >= 1.0.0
 Obsoletes:	conntrack
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,15 +58,15 @@ statystyk.
 %prep
 %setup -q
 %patch0 -p1
-find -name .svn -print0 | xargs -0 rm -rf
+%patch1 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-CFLAGS="%{rpmcflags} -D__KERNEL_STRICT_NAMES=1"
-%configure
+%configure \
+	--disable-silent-rules
 %{__make}
 
 %install
@@ -92,8 +97,10 @@ fi
 %doc AUTHORS TODO
 %attr(755,root,root) %{_sbindir}/conntrack
 %attr(755,root,root) %{_sbindir}/conntrackd
+%attr(755,root,root) %{_sbindir}/nfct
 %{_mandir}/man8/conntrack.8*
 %{_mandir}/man8/conntrackd.8*
+%{_mandir}/man8/nfct.8*
 %attr(754,root,root) /etc/rc.d/init.d/conntrackd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conntrackd/conntrackd.conf
 %dir %{_sysconfdir}/conntrackd