- updated to 4.5.0

- outdated iptables* patches replaced by XT_LIB_DIR define
- added old-hyperref patch (allows to build docs with old hyperref version from texlive 2008)

diff --git a/iproute2-iptables.patch b/iproute2-iptables.patch
deleted file mode 100644 (file)
index 9cc8c08..0000000
--- a/iproute2-iptables.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iproute2-2.6.14-051107/include/iptables.h~ 2005-12-05 20:25:14.753026000 +0000
-+++ iproute2-2.6.14-051107/include/iptables.h  2005-12-05 20:25:50.063026000 +0000
-@@ -5,7 +5,7 @@
- #include "libiptc/libiptc.h"
- 
- #ifndef IPT_LIB_DIR
--#define IPT_LIB_DIR "/usr/local/lib/iptables"
-+#define IPT_LIB_DIR "/usr/lib/iptables"
- #endif
- 
- #ifndef IPPROTO_SCTP

diff --git a/iproute2-iptables64.patch b/iproute2-iptables64.patch
deleted file mode 100644 (file)
index 7568ac8..0000000
--- a/iproute2-iptables64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iproute2-2.6.14-051107/include/iptables.h~ 2005-12-05 20:25:14.753026000 +0000
-+++ iproute2-2.6.14-051107/include/iptables.h  2005-12-05 20:25:50.063026000 +0000
-@@ -5,7 +5,7 @@
- #include "libiptc/libiptc.h"
- 
- #ifndef IPT_LIB_DIR
--#define IPT_LIB_DIR "/usr/local/lib/iptables"
-+#define IPT_LIB_DIR "/usr/lib64/iptables"
- #endif
- 
- #ifndef IPPROTO_SCTP

diff --git a/iproute2-old-hyperref.patch b/iproute2-old-hyperref.patch
new file mode 100644 (file)
index 0000000..e0b058a
--- /dev/null
+++ b/iproute2-old-hyperref.patch
@@ -0,0 +1,10 @@
+--- iproute2-4.5.0/doc/tc-filters.tex.orig     2016-03-15 00:02:31.000000000 +0100
++++ iproute2-4.5.0/doc/tc-filters.tex  2016-03-15 20:58:42.996568326 +0100
+@@ -1,6 +1,6 @@
+ \documentclass[12pt,twoside]{article}
+ 
+-\usepackage[hidelinks]{hyperref}      % \url
++\usepackage{hyperref} % \url
+ \usepackage{booktabs}                 % nicer tabulars
+ \usepackage{fancyvrb}
+ \usepackage{fullpage}

diff --git a/iproute2.spec b/iproute2.spec
index 7af5cd3e7e26d2d2f9acc5acdc1493b2efa022d3..01d6bfd228c536a0b33461df17a3fec33726e3ec 100644 (file)
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -15,16 +15,15 @@ Summary(es.UTF-8):  Herramientas para encaminamiento avanzado y configuración de
 Summary(pl.UTF-8):     Narzędzie do konfigurowania sieci
 Summary(pt_BR.UTF-8):  Ferramentas para roteamento avançado e configuração de interfaces de rede
 Name:          iproute2
-Version:       4.4.0
+Version:       4.5.0
 Release:       1
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       https://www.kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz
-# Source0-md5: d762653ec3e1ab0d4a9689e169ca184f
+# Source0-md5: b9ee1cbba7e20e04dfdd4b3055181955
 Source1:       %{name}.tmpfiles
 Patch0:                %{name}-arp.patch
-Patch1:                %{name}-iptables.patch
-Patch2:                %{name}-iptables64.patch
+Patch1:                %{name}-old-hyperref.patch
 Patch3:                %{name}-LDFLAGS.patch
 Patch4:                fix-bashisms.patch
 Patch5:                %{name}-build.patch
@@ -54,6 +53,7 @@ BuildRequires:        texlive-dvips
 BuildRequires: texlive-fonts-cmsuper
 BuildRequires: texlive-fonts-jknappen
 BuildRequires: texlive-latex
+BuildRequires: texlive-latex-booktabs
 BuildRequires: texlive-tex-babel
 %endif
 Requires:      iptables-libs >= 0:1.4.5
@@ -118,11 +118,7 @@ Dokumentacja do iproute zawiera "howto" oraz przykłady ustawień.
 #%{__rm} -r include/linux
 
 %patch0 -p1
-%if "%{_lib}" == "lib64"
-%patch2 -p1
-%else
 %patch1 -p1
-%endif
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -145,7 +141,7 @@ Dokumentacja do iproute zawiera "howto" oraz przykłady ustawień.
        LD="%{__cc}" \
 %endif
        HOSTCC="%{__cc}" \
-       CCOPTS="%{rpmcflags} %{rpmcppflags} -Wno-unused-result" \
+       CCOPTS="%{rpmcflags} %{rpmcppflags} -Wno-unused-result -DXT_LIB_DIR=\\\"%{_libdir}/xtables\\\"" \
        LDFLAGS="%{rpmldflags} -Wl,-export-dynamic" \
        LIBDIR=%{_libdir} \
        %{!?with_tc:SUBDIRS="lib ip misc"}
@@ -204,6 +200,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/ss
 %attr(755,root,root) %{_sbindir}/tipc
 %dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bpf_pinning
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ematch_map
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/group
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nl_protos