- updated to 0.9.0

diff --git a/nftables.spec b/nftables.spec
index 509012472ff1db70002a0da05f51a6240055344b..bdedcf16f4e13933d3e050fa288eca21f1a71a79 100644 (file)
--- a/nftables.spec
+++ b/nftables.spec
@@ -1,12 +1,12 @@
 Summary:       Administration tool for packet filtering and classification
 Summary(pl.UTF-8):     Narzędzie administracyjne do filtrowania i klasyfikacji pakietów
 Name:          nftables
 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.8.3
+Version:       0.9.0

 Release:       1
 License:       GPL v2
 Group:         Applications/Networking
 Source0:       https://netfilter.org/projects/nftables/files/%{name}-%{version}.tar.bz2
 Release:       1
 License:       GPL v2
 Group:         Applications/Networking
 Source0:       https://netfilter.org/projects/nftables/files/%{name}-%{version}.tar.bz2

-# Source0-md5: a604501c10a302fa417410b16f293d2c
+# Source0-md5: d4dcb61df80aa544b2e142e91d937635

 URL:           https://netfilter.org/projects/nftables/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1.6
 URL:           https://netfilter.org/projects/nftables/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1.6


@@ -16,14 +16,15 @@ BuildRequires:      docbook2X
 BuildRequires: flex
 BuildRequires: gmp-devel
 BuildRequires: iptables-devel >= 1.6.1
 BuildRequires: flex
 BuildRequires: gmp-devel
 BuildRequires: iptables-devel >= 1.6.1

+BuildRequires: jansson-devel

 BuildRequires: libmnl-devel >= 1.0.3
 BuildRequires: libmnl-devel >= 1.0.3

-BuildRequires: libnftnl-devel >= 1.0.9
+BuildRequires: libnftnl-devel >= 1.1.1

 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
 Requires:      iptables-libs >= 1.6.1
 Requires:      libmnl >= 1.0.3
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
 Requires:      iptables-libs >= 1.6.1
 Requires:      libmnl >= 1.0.3

-Requires:      libnftnl >= 1.0.9
+Requires:      libnftnl >= 1.1.1

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -44,6 +45,30 @@ bloki tworzące infrastrukturę Netfilter, takie jak istniejące uchwyty,
 system śledzenia połączeń, komponent kolejkowania w przestrzeni
 użytkownika oraz podsystem logowania.
 
 system śledzenia połączeń, komponent kolejkowania w przestrzeni
 użytkownika oraz podsystem logowania.
 

+%package devel
+Summary:       Header file for nftables library
+Summary(pl.UTF-8):     Plik nagłówkowy biblioteki nftables
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description devel
+Header file for nftables library.
+
+%description devel -l pl.UTF-8
+Plik nagłówkowy biblioteki nftables.
+
+%package static
+Summary:       Static nftables library
+Summary(pl.UTF-8):     Statyczna biblioteka nftables
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static nftables library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka nftables.
+

 %prep
 %setup -q
 
 %prep
 %setup -q
 


@@ -56,6 +81,7 @@ użytkownika oraz podsystem logowania.
 %configure \
        DOCBOOK2X_MAN=/usr/bin/docbook2X2man \
        --disable-silent-rules \
 %configure \
        DOCBOOK2X_MAN=/usr/bin/docbook2X2man \
        --disable-silent-rules \

+       --with-json \

        --with-xtables
 
 %{__make}
        --with-xtables
 
 %{__make}


@@ -66,11 +92,41 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
         DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} install \
         DESTDIR=$RPM_BUILD_ROOT
 

+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnftables.la
+

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+

 %files
 %defattr(644,root,root,755)
 %files
 %defattr(644,root,root,755)

-%doc TODO files/examples

 %attr(755,root,root) %{_sbindir}/nft
 %attr(755,root,root) %{_sbindir}/nft

+%dir %{_sysconfdir}/nftables
+%attr(740,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nftables/all-in-one.nft
+%attr(740,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nftables/arp-filter.nft
+%attr(740,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nftables/bridge-filter.nft
+%attr(740,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nftables/inet-filter.nft
+%attr(740,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nftables/ipv4-filter.nft
+%attr(740,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nftables/ipv4-mangle.nft
+%attr(740,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nftables/ipv4-nat.nft
+%attr(740,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nftables/ipv4-raw.nft
+%attr(740,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nftables/ipv6-filter.nft
+%attr(740,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nftables/ipv6-mangle.nft
+%attr(740,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nftables/ipv6-nat.nft
+%attr(740,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nftables/ipv6-raw.nft
+%attr(755,root,root) %{_libdir}/libnftables.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnftables.so.0

 %{_mandir}/man8/nft.8*
 %{_mandir}/man8/nft.8*

+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnftables.so
+%{_includedir}/nftables
+%{_pkgconfigdir}/libnftables.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libnftables.a