[packages/iproute2] - up to 4.14.1; obsolete tex doc is gone

arekm arekm at pld-linux.org
Wed Nov 15 20:16:47 CET 2017 

commit cbbe9fecb387ff0e8b54320be54b2f555d828eaf
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Nov 15 20:16:37 2017 +0100

    - up to 4.14.1; obsolete tex doc is gone

 esfq-iproute2.patch         |  6 +++---
 iproute2-2.2.4-wrr.patch    |  6 +++---
 iproute2-old-hyperref.patch | 10 ---------
 iproute2-q_srr.v0.4.patch   |  6 +++---
 iproute2.spec               | 50 +++++++--------------------------------------
 5 files changed, 16 insertions(+), 62 deletions(-)
---
diff --git a/iproute2.spec b/iproute2.spec
index 6fc67d1..8cd9aab 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -4,7 +4,6 @@
 # - fix iface_descr patch
 #
 # Conditional build
-%bcond_without	doc		# don't build documentation
 %bcond_without	tc		# don't build tc program (it breaks static linkage)
 %bcond_without	atm		# disable ATM support for tc
 %bcond_with	uClibc		# do some hacks to build with uClibc
@@ -15,15 +14,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.13.0
+Version:	4.14.1
 Release:	1
 License:	GPL v2+
 Group:		Networking/Admin
 Source0:	https://www.kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz
-# Source0-md5:	69dc9e3ece3296890278f0de478330c8
+# Source0-md5:	1075423d7029e02a8f23ed4f42b7e372
 Source1:	%{name}.tmpfiles
 Patch0:		%{name}-arp.patch
-Patch1:		%{name}-old-hyperref.patch
+
 Patch3:		%{name}-LDFLAGS.patch
 Patch4:		fix-bashisms.patch
 Patch5:		%{name}-build.patch
@@ -50,19 +49,10 @@ BuildRequires:	linux-atm-devel
 BuildRequires:	linux-libc-headers >= 7:2.6.12.0-15
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.673
-%if %{with doc}
-BuildRequires:	psutils
-BuildRequires:	sgml-tools
-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
 Obsoletes:	ifstat
 Obsoletes:	iproute
+Obsoletes:	iproute2-doc < 4.14.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -114,18 +104,6 @@ This library provides an interface for kernel-user netlink interface.
 Ta biblioteka udostępnia interfejs do interfejsu netlink między jądrem
 a przestrzenią użytkownika.
 
-%package doc
-Summary:	ip and tc documentation with examples
-Summary(pl.UTF-8):	Dokumentacja do ip i tc z przykładami
-License:	GPL v2+
-Group:		Applications/System
-
-%description doc
-The iproute documentation contains howtos and examples of settings.
-
-%description doc -l pl.UTF-8
-Dokumentacja do iproute zawiera "howto" oraz przykłady ustawień.
-
 %package -n bash-completion-iproute2
 Summary:	Bash completion for iproute2 commands
 Summary(pl.UTF-8):	Bashowe dopełnianie parametrów poleceń iproute2
@@ -143,11 +121,11 @@ Bashowe dopełnianie parametrów poleceń iproute2 (obecnie tylko tc).
 %setup -q
 
 # conflict with atm-vbr patched linux-libc-headers
-%{__rm} include/linux/atm.h
+%{__rm} include/uapi/linux/atm.h
 #%{__rm} -r include/linux
 
 %patch0 -p1
-%patch1 -p1
+
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -176,8 +154,6 @@ Bashowe dopełnianie parametrów poleceń iproute2 (obecnie tylko tc).
 	%{!?with_tc:SUBDIRS="lib ip misc"} \
 	V=1
 
-%{?with_doc:%{__make} -C doc}
-
 # make sure we don't produce broken ip binary
 ./ip/ip link add type vlan help 2>&1 | grep -q "VLANID :=" || exit 1
 
@@ -200,11 +176,6 @@ cp -p include/libnetlink.h $RPM_BUILD_ROOT%{_includedir}
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
-%if %{with doc}
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-%endif
-
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/iproute2
 
 %clean
@@ -212,7 +183,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README README.decnet README.iproute2+tc README.distribution README.lnstat
+%doc README README.decnet README.iproute2+tc README.distribution README.lnstat examples
 %attr(755,root,root) %{_sbindir}/bridge
 %attr(755,root,root) %{_sbindir}/ctstat
 %attr(755,root,root) %{_sbindir}/devlink
@@ -289,13 +260,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libnetlink.h
 %{_mandir}/man3/libnetlink.3*
 
-%if %{with doc}
-%files doc
-%defattr(644,root,root,755)
-%doc doc/*.ps
-%{_examplesdir}/%{name}-%{version}
-%endif
-
 %files -n bash-completion-iproute2
 %defattr(644,root,root,755)
 %{bash_compdir}/tc
diff --git a/esfq-iproute2.patch b/esfq-iproute2.patch
index 76fada5..99c0334 100644
--- a/esfq-iproute2.patch
+++ b/esfq-iproute2.patch
@@ -1,6 +1,6 @@
-diff -Naur iproute2-2.6.19-061214.orig/include/linux/pkt_sched.h iproute2-2.6.19-061214/include/linux/pkt_sched.h
---- iproute2-2.6.19-061214.orig/include/linux/pkt_sched.h	2006-12-14 15:04:12.000000000 -0800
-+++ iproute2-2.6.19-061214/include/linux/pkt_sched.h	2007-02-13 23:18:29.000000000 -0800
+diff -Naur iproute2-2.6.19-061214.orig/include/uapi/linux/pkt_sched.h iproute2-2.6.19-061214/include/uapi/linux/pkt_sched.h
+--- iproute2-2.6.19-061214.orig/include/uapi/linux/pkt_sched.h	2006-12-14 15:04:12.000000000 -0800
++++ iproute2-2.6.19-061214/include/uapi/linux/pkt_sched.h	2007-02-13 23:18:29.000000000 -0800
 @@ -193,6 +193,36 @@ struct tc_sfq_xstats {
  	__s32		allot;
  };
diff --git a/iproute2-2.2.4-wrr.patch b/iproute2-2.2.4-wrr.patch
index 989686f..9facfd2 100644
--- a/iproute2-2.2.4-wrr.patch
+++ b/iproute2-2.2.4-wrr.patch
@@ -10,9 +10,9 @@ diff -urN iproute-2.6.20-070313-orig/tc/Makefile iproute-2.6.20-070313/tc/Makefi
  TCMODULES += q_sfb.o
  TCMODULES += f_rsvp.o
  TCMODULES += f_u32.o
-diff -urN iproute-2.6.20-070313-orig/include/linux/pkt_sched.h iproute-2.6.20-070313/include/linux/pkt_sched.h
---- iproute-2.6.20-070313-orig/include/linux/pkt_sched.h	2007-03-13 22:50:56.000000000 +0100
-+++ iproute-2.6.20-070313/include/linux/pkt_sched.h	2007-04-15 20:52:33.000000000 +0200
+diff -urN iproute-2.6.20-070313-orig/include/uapi/linux/pkt_sched.h iproute-2.6.20-070313/include/uapi/linux/pkt_sched.h
+--- iproute-2.6.20-070313-orig/include/uapi/linux/pkt_sched.h	2007-03-13 22:50:56.000000000 +0100
++++ iproute-2.6.20-070313/include/uapi/linux/pkt_sched.h	2007-04-15 20:52:33.000000000 +0200
 @@ -466,4 +498,116 @@
  #define NETEM_DIST_SCALE	8192
  #define NETEM_DIST_MAX		16384
diff --git a/iproute2-old-hyperref.patch b/iproute2-old-hyperref.patch
deleted file mode 100644
index e0b058a..0000000
--- a/iproute2-old-hyperref.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-q_srr.v0.4.patch b/iproute2-q_srr.v0.4.patch
index d2b9ce2..646f517 100644
--- a/iproute2-q_srr.v0.4.patch
+++ b/iproute2-q_srr.v0.4.patch
@@ -1,6 +1,6 @@
-diff -ruN iproute-20041019/include/linux/pkt_sched.h iproute-20041019.srr.patched.v0.4/include/linux/pkt_sched.h
---- iproute-20041019/include/linux/pkt_sched.h	2006-07-27 13:04:00.000000000 +0300
-+++ iproute-20041019.srr.patched.v0.4/include/linux/pkt_sched.h	2006-07-27 13:11:36.000000000 +0300
+diff -ruN iproute-20041019/include/uapi/linux/pkt_sched.h iproute-20041019.srr.patched.v0.4/include/uapi/linux/pkt_sched.h
+--- iproute-20041019/include/uapi/linux/pkt_sched.h	2006-07-27 13:04:00.000000000 +0300
++++ iproute-20041019.srr.patched.v0.4/include/uapi/linux/pkt_sched.h	2006-07-27 13:11:36.000000000 +0300
 @@ -550,6 +550,14 @@
   *	to change these parameters in compile time.
   */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iproute2.git/commitdiff/cbbe9fecb387ff0e8b54320be54b2f555d828eaf

More information about the pld-cvs-commit mailing list