From 5eac15cc6a2f05a867276183d44c74001c93f61bc6c3ad91350c974a35d43676 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 30 Jul 2012 14:54:56 +0000 Subject: [PATCH] Accepting request 129322 from home:WernerFink:branches:security:netfilter - Make it build with modern pdflatex and TeXLive 2012 ... for this also sgmltools has to know about correct babel style usage OBS-URL: https://build.opensuse.org/request/show/129322 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=52 --- iproute2-pdflatex.diff | 47 ++++++++++++++++++++++++++++++++++++++++++ iproute2.changes | 6 ++++++ iproute2.spec | 11 ++++++++++ 3 files changed, 64 insertions(+) create mode 100644 iproute2-pdflatex.diff diff --git a/iproute2-pdflatex.diff b/iproute2-pdflatex.diff new file mode 100644 index 0000000..b62bf53 --- /dev/null +++ b/iproute2-pdflatex.diff @@ -0,0 +1,47 @@ +--- doc/Makefile ++++ doc/Makefile 2012-07-30 14:32:31.934018848 +0000 +@@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6 + + LATEX=latex + DVIPS=dvips +-SGML2DVI=sgml2latex --output=dvi ++SGML2DVI=sgml2latex + SGML2HTML=sgml2html -s 0 + LPR=lpr -Zsduplex + SHELL=bash +@@ -32,7 +32,7 @@ print: $(PSFILES) + $(LPR) $(PSFILES) + + %.dvi: %.sgml +- $(SGML2DVI) $< ++ $(SGML2DVI) --output=dvi $< + + %.dvi: %.tex + @set -e; pass=2; echo "Running LaTeX $<"; \ +@@ -44,10 +44,22 @@ print: $(PSFILES) + echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ + done + +-#%.pdf: %.tex +-# pdflatex $< +-%.pdf: %.ps +- ps2pdf $< ++%.tex: %.sgml ++ $(SGML2DVI) --output=tex $< ++ ++%.pdf: %.tex ++ @set -e; pass=2; echo "Running pdfLaTeX $<"; \ ++ TEXINPUTS="/usr/lib/sgml-tools:$$(kpsewhich '-var-value=TEXINPUTS')"; \ ++ while [ `TEXINPUTS="$$TEXINPUTS" pdflatex $< &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 LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ ++ done ++ ++#%.pdf: %.ps ++# ps2pdf $< + + %.ps: %.dvi + $(DVIPS) $< -o $@ diff --git a/iproute2.changes b/iproute2.changes index 973de23..33d58e8 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 30 14:33:58 UTC 2012 - werner@suse.de + +- Make it build with modern pdflatex and TeXLive 2012 ... for this + also sgmltools has to know about correct babel style usage + ------------------------------------------------------------------- Thu May 24 19:38:03 UTC 2012 - jengelh@inai.de diff --git a/iproute2.spec b/iproute2.spec index b0c97c4..abe15d0 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -33,6 +33,9 @@ Source2: %name-%version.tar.sign Patch0: iproute2-libdir-1.diff # PATCH-??-OPENSUSE iproute2-HZ.diff status=noidea Patch1: iproute2-HZ.diff +%if 0%{?suse_version} +Patch42: iproute2-pdflatex.diff +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel @@ -46,6 +49,11 @@ BuildRequires: xz BuildRequires: ghostscript-x11 BuildRequires: sgmltool BuildRequires: texlive-latex +%if 0%{?suse_version} > 1220 +BuildRequires: texlive-amsfonts +BuildRequires: texlive-cm-super +BuildRequires: texlive-ec +%endif %endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: ghostscript @@ -99,6 +107,9 @@ tar -xf "%{S:0}" --use=xz; %setup -DTq %endif %patch -P 0 -P 1 -p1 +%if 0%{?suse_version} +%patch42 -p0 +%endif find . -name *.orig -delete %build