pool/iproute2
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 129327 from security:netfilter

Browse Source 
- Make it build with modern pdflatex and TeXLive 2012 ... for this
  also sgmltools has to know about correct babel style usage (forwarded request 129322 from <bound method Request.get_creator of <osc.core.Request instance at 0x2c2a0e0>>)

OBS-URL: https://build.opensuse.org/request/show/129327
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=57
This commit is contained in:
Stephan Kulow 2012-08-04 07:16:07 +00:00 committed by Git OBS Bridge
commit 81d7f48109
3 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
iproute2-pdflatex.diff Normal file
View File

@ -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 $< </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 $@

6
iproute2.changes
View File

@ -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

16
iproute2.spec
View File

@ -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
@ -56,8 +64,11 @@ BuildRequires: tetex-latex
%endif
%define with_xt 1
%if 0%{?with_xt}
BuildRequires: pkgconfig(libnl-1)
%if 0%{?suse_version} >= 1140
BuildRequires: pkgconfig(xtables) >= 1.4.11
%else
BuildRequires: libxtables-devel >= 1.4.11
%endif
%endif
Provides: iproute = %version-%release
@ -96,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