Remove iproute2-pdflatex.diff

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=55
This commit is contained in:
Jan Engelhardt 2012-09-10 03:31:47 +00:00 committed by Git OBS Bridge
parent dd9bee6148
commit 52278c4541
3 changed files with 4 additions and 53 deletions

View File

@ -1,47 +0,0 @@
--- 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 $< </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 LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \
+ done
+
+#%.pdf: %.ps
+# ps2pdf $<
%.ps: %.dvi
$(DVIPS) $< -o $@

View File

@ -7,6 +7,8 @@ Sat Sep 8 09:26:32 UTC 2012 - jengelh@inai.de
* tc: Support for tc_codel - Controlled Delay AQM * tc: Support for tc_codel - Controlled Delay AQM
* tc: Support for fq_codel - Fair Queue Codel AQM * tc: Support for fq_codel - Fair Queue Codel AQM
* tc-netem: Add support for ECN packet marking * tc-netem: Add support for ECN packet marking
- Remove undocumented iproute2-pdflatex.diff which breaks the
build since using the iproute2-3.5.1 tarball
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 30 14:33:58 UTC 2012 - werner@suse.de Mon Jul 30 14:33:58 UTC 2012 - werner@suse.de

View File

@ -33,9 +33,6 @@ Source2: %name-%version.tar.sign
Patch0: iproute2-libdir-1.diff Patch0: iproute2-libdir-1.diff
# PATCH-??-OPENSUSE iproute2-HZ.diff status=noidea # PATCH-??-OPENSUSE iproute2-HZ.diff status=noidea
Patch1: iproute2-HZ.diff Patch1: iproute2-HZ.diff
%if 0%{?suse_version}
Patch42: iproute2-pdflatex.diff
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison BuildRequires: bison
BuildRequires: db-devel BuildRequires: db-devel
@ -53,6 +50,8 @@ BuildRequires: sgmltool
BuildRequires: texlive-dvips-bin BuildRequires: texlive-dvips-bin
%endif %endif
%if 0%{?suse_version} < 1230 %if 0%{?suse_version} < 1230
BuildRequires: texlive
BuildRequires: texlive-bin-latex
BuildRequires: texlive-latex BuildRequires: texlive-latex
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
BuildRequires: texlive-amsfonts BuildRequires: texlive-amsfonts
@ -112,9 +111,6 @@ tar -xf "%{S:0}" --use=xz;
%setup -DTq %setup -DTq
%endif %endif
%patch -P 0 -P 1 -p1 %patch -P 0 -P 1 -p1
%if 0%{?suse_version}
%patch42 -p0
%endif
find . -name *.orig -delete find . -name *.orig -delete
%build %build