[packages/nftables] - updated to 0.4 - removed obsolete db2man patch

[qboosh]

commit 09b93bc2af9fdd8fc3c23e841819cd7a3ddcf6a9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jan 28 21:09:16 2015 +0100

    - updated to 0.4
    - removed obsolete db2man patch

 nftables-db2man.patch | 28 ----------------------------
 nftables.spec         | 22 +++++++++++++++-------
 2 files changed, 15 insertions(+), 35 deletions(-)
---
diff --git a/nftables.spec b/nftables.spec
index f1dd862..ef54dc4 100644
--- a/nftables.spec
+++ b/nftables.spec
@@ -1,23 +1,25 @@
 Summary:	Administration tool for packet filtering and classification
 Summary(pl.UTF-8):	Narzędzie administracyjne do filtrowania i klasyfikacji pakietów
 Name:		nftables
-Version:	0.3
+Version:	0.4
 Release:	1
 License:	GPL v2
 Group:		Applications/Networking
 Source0:	http://www.netfilter.org/projects/nftables/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	244e449ee80bbbf2b2908d861b074c7f
-Patch0:		%{name}-db2man.patch
+# Source0-md5:	09b686c489ff10db670ca60dbed7ff43
 URL:		http://www.netfilter.org/projects/nftables/
 BuildRequires:	autoconf >= 2.61
+BuildRequires:	automake >= 1.6
 BuildRequires:	bison
 BuildRequires:	dblatex
 BuildRequires:	docbook2X
 BuildRequires:	flex
 BuildRequires:	gmp-devel
-BuildRequires:	libmnl-devel
-BuildRequires:	libnftnl-devel
+BuildRequires:	libmnl-devel >= 1.0.3
+BuildRequires:	libnftnl-devel >= 1.0.2
 BuildRequires:	readline-devel
+Requires:	libmnl >= 1.0.3
+Requires:	libnftnl >= 1.0.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,12 +42,15 @@ użytkownika oraz podsystem logowania.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-	DB2MAN=/usr/bin/docbook2X2man
+	DOCBOOK2X_MAN=/usr/bin/docbook2X2man \
+	--disable-silent-rules
 
 %{__make}
 
@@ -55,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
         DESTDIR=$RPM_BUILD_ROOT
 
+# man page in groff format is sufficient
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/nftables/pdf/nft.pdf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
diff --git a/nftables-db2man.patch b/nftables-db2man.patch
deleted file mode 100644
index b0183fd..0000000
--- a/nftables-db2man.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- nftables-0.2/configure.ac.orig	2014-04-14 13:16:24.000000000 +0200
-+++ nftables-0.2/configure.ac	2014-04-19 14:07:59.475893678 +0200
-@@ -25,20 +25,13 @@
- AC_PROG_INSTALL
- AC_PROG_SED
- 
--AC_CHECK_PROG(CONFIG_MAN1, [docbook2x-man], [y], [n])
--if test "$CONFIG_MAN1" == "y"
-+AC_CHECK_PROG(DB2MAN, [docbook2x-man db2x_docbook2man], [n])
-+if test "$DB2MAN" = "n"
- then
--	CONFIG_MAN=y
--	DB2MAN=docbook2x-man
-+	CONFIG_MAN=n
-+	AC_MSG_WARN([docbookx2-man/db2x_docbook2man not found, no manpages will be built])
- else
--	AC_CHECK_PROG(CONFIG_MAN2, [db2x_docbook2man], [y], [n])
--	if test "$CONFIG_MAN2" == "y"
--	then
--		CONFIG_MAN=y
--		DB2MAN=db2x_docbook2man
--	else
--		AC_MSG_WARN([docbookx2-man/db2x_docbook2man not found, no manpages will be built])
--	fi
-+	CONFIG_MAN=y
- fi
- AC_SUBST(CONFIG_MAN)
- AC_SUBST(DB2MAN)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nftables.git/commitdiff/09b93bc2af9fdd8fc3c23e841819cd7a3ddcf6a9