From 52278c45412dd99fbaeef17b1dbccdd87db3174dc29273309d700c860405c36c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 10 Sep 2012 03:31:47 +0000
Subject: [PATCH] Remove iproute2-pdflatex.diff

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=55
---
 iproute2-pdflatex.diff | 47 ------------------------------------------
 iproute2.changes       |  2 ++
 iproute2.spec          |  8 ++-----
 3 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100644 iproute2-pdflatex.diff

diff --git a/iproute2-pdflatex.diff b/iproute2-pdflatex.diff
deleted file mode 100644
index b62bf53..0000000
--- a/iproute2-pdflatex.diff
+++ /dev/null
@@ -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 $@
diff --git a/iproute2.changes b/iproute2.changes
index 6db714a..a2b0faf 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -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 fq_codel - Fair Queue Codel AQM
 * 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
diff --git a/iproute2.spec b/iproute2.spec
index ea6c918..5a66b23 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -33,9 +33,6 @@ 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
@@ -53,6 +50,8 @@ BuildRequires:  sgmltool
 BuildRequires:  texlive-dvips-bin
 %endif
 %if 0%{?suse_version} < 1230
+BuildRequires:  texlive
+BuildRequires:  texlive-bin-latex
 BuildRequires:  texlive-latex
 %if 0%{?suse_version} > 1220
 BuildRequires:  texlive-amsfonts
@@ -112,9 +111,6 @@ 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