nftables-0.4

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/nftables?expand=0&rev=12

nftables.spec

@@ -17,17 +17,15 @@
 
 
 Name:           nftables
-Version:        0.3
+Version:        0.4
 Release:        0
 Summary:        Userspace utility to access the nf_tables packet filter
 License:        GPL-2.0
 Group:          Productivity/Networking/Security
 
 #Git-Clone:	git://git.netfilter.org/nftables
-#Git-Clone:	git://git.inai.de/nftables plus
-#Git-Snapshot:	nftables-plus-0.3
-Source:         http://xtables.de/files/nftables-plus-%version.tar.xz
-Source2:        http://xtables.de/files/nftables-plus-%version.tar.asc
+Source:         http://ftp.netfilter.org/pub/nftables/nftables-%version.tar.bz2
+Source2:        http://ftp.netfilter.org/pub/nftables/nftables-%version.tar.bz2.sig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  dblatex
@@ -37,8 +35,10 @@ BuildRequires:  gmp-devel
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  readline-devel
 BuildRequires:  xsltproc
-BuildRequires:  pkgconfig(libmnl)
-BuildRequires:  pkgconfig(libnftnl) >= 1.0
+BuildRequires:  pkgconfig(libmnl) >= 1.0.3
+BuildRequires:  pkgconfig(libnftnl) >= 1.0.2
+Obsoletes:      nftables-plus < %version-%release
+Provides:       nftables-plus = %version-%release
 
 %description
 nf_tables is the new firewalling infrastructure in the Linux kernel,
@@ -46,38 +46,31 @@ intended to replace ip_tables, ip6_tables, arp_tables and ebtables in
 the long term. nftables is the corresponsing userspace frontend,
 replacing their respective userspace utilities.
                                                                                 
-%package plus
-Summary:        Userspace utility to access the nf_tables packet filter
-Group:          Productivity/Networking/Security
-Provides:       nftables = %version-%release
-
-%description plus
-nf_tables is the new firewalling infrastructure in the Linux kernel,
-intended to replace ip_tables, ip6_tables, arp_tables and ebtables in
-the long term. nftables is the corresponsing userspace frontend,
-replacing their respective userspace utilities.
-                                                                                
 nftables features native support for sets and dictionaries of
 arbitrary types, support for many different protocols, meta data
 types, connection tracking, NAT, logging, atomic incremental and full
 ruleset updates.
 
 %prep
-%setup -qn %name-plus-%version
+%setup -q
 
 %build
 mkdir bin
 ln -s "%_bindir/docbook-to-man" bin/docbook2x-man
 export PATH="$PATH:$PWD/bin"
+mkdir obj
+pushd obj/
+%define _configure ../configure
 %configure --docdir="%_docdir/%name"
 make %{?_smp_mflags}
+popd
 
 %install
 b="%buildroot"
-make install DESTDIR="$b"
+%make_install -C obj
 cp -a COPYING "$b/%_docdir/%name/"
 
-%files plus
+%files
 %defattr(-,root,root)
 %config %_sysconfdir/nftables
 %_sbindir/nft