- Remove iproute2-doc (removed upstream) and doc-revert-PDF-creation.patch .

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

doc-revert-PDF-creation.patch

@@ -1,65 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Tue, 9 Oct 2012 14:27:11 +0200
-Subject: doc: revert PDF creation
-Patch-mainline: Never, temporary workaround
-
-Revert 0ecf26fc7d2f24570b4c04a668c437b8656a40a7, since it
-makes PDF creation fail on SUSE <= 12.2.
-
-(cannot find linuxdoc-sgml.sty; seems like /usr/lib/sgml-tool
-is not in the search path with texlive 2011/suse122.)
----
- doc/Makefile | 22 ++++++----------------
- 1 file changed, 6 insertions(+), 16 deletions(-)
-
-diff --git a/doc/Makefile b/doc/Makefile
-index 0c51872afac5..e7514e4c3c9a 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6-flowlabels.ps ss.ps nstat.ps arpd.ps rt
- 
- LATEX=latex
- DVIPS=dvips
--SGML2DVI=sgml2latex
-+SGML2DVI=sgml2latex --output=dvi
- SGML2HTML=sgml2html -s 0
- LPR=lpr -Zsduplex
- SHELL=bash
-@@ -31,11 +31,8 @@ pdf: $(PDFFILES)
- print: $(PSFILES)
- 	$(LPR) $(PSFILES)
- 
--%.tex: %.sgml
--	$(SGML2DVI) --output=tex $<
--
- %.dvi: %.sgml
--	$(SGML2DVI) --output=dvi $<
-+	$(SGML2DVI) $<
- 
- %.dvi: %.tex
- 	@set -e; pass=2; echo "Running LaTeX $<"; \
-@@ -47,17 +44,10 @@ print: $(PSFILES)
- 		echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \
- 	done
- 
--%.pdf: %.tex
--	@set -e; pass=2; echo "Running pdfLaTeX $<"; \
--	while [ `pdflatex $< </dev/null 2>&1 | \
--		 grep -c '^\(LaTeX Warning: Label(s) may\|No file \|! Emergency stop\)'` -ge 1 ]; do \
--		if [ $$pass -gt 3 ]; then \
--			echo "Seems, something is wrong. Try by hands." ; exit 1 ; \
--		fi; \
--		echo "Re-running pdfLaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \
--	done
--#%.pdf: %.ps
--#	ps2pdf $<
-+#%.pdf: %.tex
-+#	pdflatex $<
-+%.pdf: %.ps
-+	ps2pdf $<
- 
- %.ps: %.dvi
- 	$(DVIPS) $< -o $@
--- 
-2.14.1
-

iproute2-doc.spec

@@ -1,113 +0,0 @@
-#
-# spec file for package iproute2-doc
-#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-Name:           iproute2-doc
-Version:        4.14.1
-Release:        0
-%define rversion 4.14.1
-Summary:        Documentation to iproute2
-License:        GPL-2.0+
-Group:          Documentation/Other
-Url:            http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
-
-Source:         http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%rversion.tar.xz
-Source2:        http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%rversion.tar.sign
-BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  bison
-BuildRequires:  db-devel
-BuildRequires:  flex
-BuildRequires:  pkgconfig >= 0.21
-BuildRequires:  sgmltool
-BuildRequires:  texlive
-BuildRequires:  texlive-amsfonts
-BuildRequires:  texlive-cm-super
-BuildRequires:  texlive-dvips
-BuildRequires:  texlive-ec
-BuildRequires:  texlive-latex
-BuildRequires:  tex(english.ldf)
-BuildRequires:  tex(fancyvrb.sty)
-BuildRequires:  tex(float.sty)
-BuildRequires:  tex(fullpage.sty)
-%define with_xt 1
-%if 0%{?with_xt}
-BuildRequires:  pkgconfig(libmnl)
-BuildRequires:  pkgconfig(xtables) >= 1.4.11
-%endif
-
-Patch1:         adjust-installation-directories-for-openSUSE-SLE.patch
-Patch2:         use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch
-Patch3:         add-explicit-typecast-to-avoid-gcc-warning.patch
-Patch4:         xfrm-support-displaying-transformations-used-for-Mob.patch
-Patch5:         man-fix-documentation-references-in-manual-pages.patch
-Patch6:         split-link-and-compile-steps-for-binaries.patch
-Patch7:         examples-fix-bashisms-in-example-script.patch
-Patch101:       doc-revert-PDF-creation.patch
-Patch102:       Revert-emp-fix-warning-on-deprecated-bison-directive.patch
-
-%description
-This package contains the PDF documentation from iproute2,
-as well as examples and other outdated files.
-
-%prep
-%setup -qn iproute2-%rversion
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220)
-%patch101 -p1
-%endif
-%if 0%{?sles_version} == 11
-%patch102 -p1
-%endif
-find . -name *.orig -delete
-
-%build
-# build with -fPIC. For details see
-# https://bugzilla.novell.com/show_bug.cgi?id=388021
-xt_libdir="$(pkg-config xtables --variable=xtlibdir)";
-xt_cflags="$(pkg-config xtables --cflags)";
-make %{?_smp_mflags} LIBDIR="%_libdir" CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-prototypes -Wno-error -fPIC -DXT_LIB_DIR=\\\"$xt_libdir\\\" $xt_cflags"
-
-cd doc
-make pdf
-
-%install
-make install DESTDIR="%buildroot" LIBDIR="%_libdir" \
-    MODDESTDIR="$b/%_libdir/tc" DOCDIR="%_docdir/iproute2"
-
-mkdir -p "%buildroot/%_docdir/iproute2";
-cp -an ip/{ifcfg,routef,routel} doc/*.pdf "%buildroot/%_docdir/iproute2/"
-
-t="$$"
-mkdir "$t"
-mv "%buildroot/%_docdir" "$t/"
-rm -rf "%buildroot"/*
-mkdir -p "%buildroot/%_docdir"
-mv "$t/packages"/* "%buildroot/%_docdir"
-rm -rf "$t"
-
-%files
-%defattr(-,root,root)
-%_docdir/iproute2
-
-%changelog

iproute2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Dec 10 23:47:36 UTC 2017 - jengelh@inai.de
+
+- Remove iproute2-doc (removed upstream) and
+  doc-revert-PDF-creation.patch .
+
 -------------------------------------------------------------------
 Fri Nov 17 21:05:25 UTC 2017 - jengelh@inai.de
 

iproute2.spec

@@ -30,11 +30,19 @@ Url:            http://www.linuxfoundation.org/collaborate/workgroups/networking
 #Git-Clone:	git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2
 Source:         http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.xz
 Source2:        http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.sign
-Source666:      pre_checkin.sh
+Source9:        %name.keyring
-Source667:      %name.keyring
+Patch1:         adjust-installation-directories-for-openSUSE-SLE.patch
+Patch2:         use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch
+Patch3:         add-explicit-typecast-to-avoid-gcc-warning.patch
+Patch4:         xfrm-support-displaying-transformations-used-for-Mob.patch
+Patch5:         man-fix-documentation-references-in-manual-pages.patch
+Patch6:         split-link-and-compile-steps-for-binaries.patch
+Patch7:         examples-fix-bashisms-in-example-script.patch
+Patch102:       Revert-emp-fix-warning-on-deprecated-bison-directive.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  db-devel
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  libelf-devel
 BuildRequires:  pkgconfig >= 0.21
@@ -48,16 +56,6 @@ BuildRequires:  pkgconfig(xtables) >= 1.4.11
 Provides:       iproute = %version-%release
 Provides:       %name(xfrm6_raw) = %version-%release
 
-Patch1:         adjust-installation-directories-for-openSUSE-SLE.patch
-Patch2:         use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch
-Patch3:         add-explicit-typecast-to-avoid-gcc-warning.patch
-Patch4:         xfrm-support-displaying-transformations-used-for-Mob.patch
-Patch5:         man-fix-documentation-references-in-manual-pages.patch
-Patch6:         split-link-and-compile-steps-for-binaries.patch
-Patch7:         examples-fix-bashisms-in-example-script.patch
-Patch101:       doc-revert-PDF-creation.patch
-Patch102:       Revert-emp-fix-warning-on-deprecated-bison-directive.patch
-
 %description
 iproute2 is a collection of user-space utilities to set up networking
 under Linux from the command-line. It can inspect and configure,
@@ -86,18 +84,9 @@ bash command line completion support for iproute.
 
 %prep
 %setup -qn %name-%rversion
-%patch1 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220)
-%patch101 -p1
-%endif
 %if 0%{?sles_version} == 11
-%patch102 -p1
+%patch -P 102 -p1
 %endif
 find . -name *.orig -delete
 
@@ -126,20 +115,14 @@ mkdir -p "$b/bin"
 ln -sf "%_sbindir/ip" "$b/bin/ip"
 #EndUsrMerge
 for BIN in lnstat nstat routef routel ss; do
-	ln -sf "%{_sbindir}/$BIN" "$b%{_bindir}/$BIN"
+	ln -sf "%_sbindir/$BIN" "$b/%_bindir/$BIN"
 done
 rm "$b/%_sbindir/ifcfg"
-
-mkdir -p "$b/%_docdir/%name"
-# packaged in iproute2-doc:
-rm -rf $b/%_docdir/%name/*
 cp -an README* COPYING "$b/%_docdir/%name/"
+%fdupes %buildroot/%_prefix
 
 %files
 %defattr(-,root,root)
-%dir %_docdir/%name
-%_docdir/%name/README*
-%_docdir/%name/COPYING
 %_bindir/lnstat
 %_bindir/nstat
 %_bindir/routef
@@ -156,6 +139,7 @@ cp -an README* COPYING "$b/%_docdir/%name/"
 %config(noreplace) %_sysconfdir/iproute2/*
 %_libdir/tc/
 %_datadir/tc/
+%_docdir/%name/
 
 %files -n libnetlink-devel
 %defattr(-,root,root)

pre_checkin.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-echo -n "Generating iproute2-doc.spec/changes "
-
-cp iproute2.changes iproute2-doc.changes
-
-sed -i -e "s/\(Version:\).*/\1$(sed -n 's/Version:\(.*\)/\1/p' iproute2.spec)/" iproute2-doc.spec
-
-osc service localrun format_spec_file
-
-echo "Done."
-