diff --git a/.gitignore b/.gitignore index 4bb1ba3..1fe8535 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /nftables-20140426.tar.bz2 /nftables-20140704.tar.bz2 /nftables-20140903.tar.bz2 +/nftables-0.4.tar.bz2 diff --git a/nftables-20140118-db2x_docbook2man.patch b/nftables-20140118-db2x_docbook2man.patch deleted file mode 100644 index efec20d..0000000 --- a/nftables-20140118-db2x_docbook2man.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Nur nftables-20140118.orig/configure nftables-20140118/configure ---- nftables-20140118.orig/configure 2014-01-17 22:28:04.000000000 -0700 -+++ nftables-20140118/configure 2014-01-18 15:42:10.427000000 -0700 -@@ -3310,8 +3310,8 @@ - rm -f conftest.sed - - --# Extract the first word of "docbook2x-man", so it can be a program name with args. --set dummy docbook2x-man; ac_word=$2 -+# Extract the first word of "db2x_docbook2man", so it can be a program name with args. -+set dummy db2x_docbook2man; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CONFIG_MAN+set}" = set; then : -@@ -3350,8 +3350,8 @@ - - if test "$CONFIG_MAN" != "y" - then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: docbookx2-man not found, no manpages will be built" >&5 --$as_echo "$as_me: WARNING: docbookx2-man not found, no manpages will be built" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: db2x_docbook2man not found, no manpages will be built" >&5 -+$as_echo "$as_me: WARNING: db2x_docbook2man not found, no manpages will be built" >&2;} - fi - - # Extract the first word of "db2pdf", so it can be a program name with args. -diff -Nur nftables-20140118.orig/configure.ac nftables-20140118/configure.ac ---- nftables-20140118.orig/configure.ac 2014-01-17 22:28:00.000000000 -0700 -+++ nftables-20140118/configure.ac 2014-01-18 15:42:24.483000000 -0700 -@@ -25,10 +25,10 @@ - AC_PROG_INSTALL - AC_PROG_SED - --AC_CHECK_PROG(CONFIG_MAN, docbook2x-man, y, n) -+AC_CHECK_PROG(CONFIG_MAN, db2x_docbook2man, y, n) - if test "$CONFIG_MAN" != "y" - then -- AC_MSG_WARN([docbookx2-man not found, no manpages will be built]) -+ AC_MSG_WARN([db2x_docbook2man not found, no manpages will be built]) - fi - - AC_CHECK_PROG(CONFIG_PDF, db2pdf, y, n) -diff -Nur nftables-20140118.orig/Makefile.rules.in nftables-20140118/Makefile.rules.in ---- nftables-20140118.orig/Makefile.rules.in 2014-01-17 22:28:00.000000000 -0700 -+++ nftables-20140118/Makefile.rules.in 2014-01-18 15:27:45.759000000 -0700 -@@ -37,7 +37,7 @@ - - %.8: %.xml $(makedeps) - @echo -e " MAN\t\t$@" -- (cd $(SUBDIR); docbook2x-man ../$<) -+ (cd $(SUBDIR); db2x_docbook2man ../$<) - - %.pdf: %.xml $(makedeps) - @echo -e " PDF\t\t$@" diff --git a/nftables-20140118-disable-silent-make.patch b/nftables-20140118-disable-silent-make.patch deleted file mode 100644 index 2358a92..0000000 --- a/nftables-20140118-disable-silent-make.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Nur nftables-20140118.orig/Makefile.rules.in nftables-20140118/Makefile.rules.in ---- nftables-20140118.orig/Makefile.rules.in 2014-01-17 22:28:00.000000000 -0700 -+++ nftables-20140118/Makefile.rules.in 2014-01-18 14:43:35.889000000 -0700 -@@ -93,4 +93,4 @@ - .PHONY: $(SUBDIRS) - $(SUBDIRS): - @echo -e " SUBDIR\t$@/" -- @$(MAKE) -s -f Makefile.rules $(MAKECMDGOALS) SUBDIR="$@/" SUBDIRS="" -+ @$(MAKE) -f Makefile.rules $(MAKECMDGOALS) SUBDIR="$@/" SUBDIRS="" diff --git a/nftables-20140118-dtdpath.patch b/nftables-20140118-dtdpath.patch deleted file mode 100644 index 4e3ab4f..0000000 --- a/nftables-20140118-dtdpath.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur nftables-20140118.orig/doc/nftables.xml nftables-20140118/doc/nftables.xml ---- nftables-20140118.orig/doc/nftables.xml 2014-01-17 22:28:00.000000000 -0700 -+++ nftables-20140118/doc/nftables.xml 2014-01-18 14:42:47.941000000 -0700 -@@ -1,6 +1,6 @@ - - -+ "/usr/share/sgml/docbook/xml-dtd-4.5/docbookx.dtd"> - - - diff --git a/nftables.spec b/nftables.spec index 522a1b7..cb8f83a 100644 --- a/nftables.spec +++ b/nftables.spec @@ -1,23 +1,22 @@ -%global snapdate 20140903 +#global snapdate 20140903 Name: nftables -Version: 0.100 -Release: 4.%{snapdate}git%{?dist} +Version: 0.4 +#Release: 0.1.%{snapdate}git%{?dist} +Release: 1%{?dist} +# Upstream released a 0.100 version, then 0.4. Need Epoch to get back on track. +Epoch: 1 Summary: Netfilter Tables userspace utillites License: GPLv2 URL: http://netfilter.org/projects/nftables/ -Source0: http://ftp.netfilter.org/pub/nftables/snapshot/nftables-%{snapdate}.tar.bz2 +#Source0: http://ftp.netfilter.org/pub/nftables/snapshot/nftables-%{snapdate}.tar.bz2 +Source0: http://ftp.netfilter.org/pub/nftables/nftables-%{version}.tar.bz2 -# -# Disable silent make so we can see compiler flags and such -# -Patch1: nftables-20140118-disable-silent-make.patch - -BuildRequires: autogen -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool +#BuildRequires: autogen +#BuildRequires: autoconf +#BuildRequires: automake +#BuildRequires: libtool BuildRequires: flex BuildRequires: bison BuildRequires: libmnl-devel @@ -30,13 +29,12 @@ BuildRequires: docbook2X Netfilter Tables userspace utilities. %prep -%setup -q -n nftables-%{snapdate} - -%patch1 -p1 +#setup -q -n nftables-%{snapdate} +%setup -q %build -./autogen.sh -%configure +#./autogen.sh +%configure --disable-silent-rules make %{?_smp_mflags} %install @@ -51,6 +49,10 @@ chmod 644 $RPM_BUILD_ROOT/%{_mandir}/man8/nft* %{_mandir}/man8/nft* %changelog +* Fri Dec 26 2014 Kevin Fenzi 0.4-1 +- Update to 0.4 +- Add Epoch to fix versioning. + * Wed Sep 03 2014 Kevin Fenzi 0.100-4.20140903git - Update to 20140903 snapshot diff --git a/sources b/sources index 780a8a0..85759f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47e574e788529eeef35086f25f3ee997 nftables-20140903.tar.bz2 +09b686c489ff10db670ca60dbed7ff43 nftables-0.4.tar.bz2