Hello community, here is the log from the commit of package iproute2 for openSUSE:Factory checked in at 2012-08-04 09:16:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iproute2 (Old) and /work/SRC/openSUSE:Factory/.iproute2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iproute2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/iproute2/iproute2.changes 2012-06-01 07:20:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iproute2.new/iproute2.changes 2012-08-04 09:16:29.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 30 14:33:58 UTC 2012 - [email protected] + +- Make it build with modern pdflatex and TeXLive 2012 ... for this + also sgmltools has to know about correct babel style usage + +------------------------------------------------------------------- New: ---- iproute2-pdflatex.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.H4MxNp/_old 2012-08-04 09:16:31.000000000 +0200 +++ /var/tmp/diff_new_pack.H4MxNp/_new 2012-08-04 09:16:31.000000000 +0200 @@ -33,6 +33,9 @@ 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: 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 @@ %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 @@ %setup -DTq %endif %patch -P 0 -P 1 -p1 +%if 0%{?suse_version} +%patch42 -p0 +%endif find . -name *.orig -delete %build ++++++ iproute2-pdflatex.diff ++++++ --- 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 $@ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
