diff --git a/iproute2.changes b/iproute2.changes index 7a4deb4..576bde5 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -11,6 +11,8 @@ Tue Oct 9 13:27:11 UTC 2012 - jengelh@inai.de * iproute2: VTI support for ip link command - Rename iproute2-libdir-1.diff to iproute2-dirs.diff, as it does more than just changing LIBDIR. +- Add revert-pdf-creation.diff, as the new PDF creation commands + do not want to work with openSUSE 12.2 and before. ------------------------------------------------------------------- Tue Sep 18 06:36:19 UTC 2012 - werner@suse.de diff --git a/iproute2.spec b/iproute2.spec index 144ec07..209556e 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -29,10 +29,9 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/networking #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2 Source: %name-%version.tar.xz Source2: %name-%version.tar.sign -# PATCH-FIX-UPSTREAM iproute2-libdir-1.diff status=unknown Patch1: iproute2-dirs.diff -# PATCH-??-OPENSUSE iproute2-HZ.diff status=noidea Patch2: iproute2-HZ.diff +Patch3: revert-pdf-creation.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel @@ -106,6 +105,9 @@ tar -xf "%{S:0}" --use=xz; %setup -DTq %endif %patch -P 1 -P 2 -p1 +%if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220) +%patch -P 3 -p1 +%endif find . -name *.orig -delete %build diff --git a/revert-pdf-creation.diff b/revert-pdf-creation.diff new file mode 100644 index 0000000..f5c2f1e --- /dev/null +++ b/revert-pdf-creation.diff @@ -0,0 +1,54 @@ +Revert 0ecf26fc7d2f24570b4c04a668c437b8656a40a7, since it +makes PDF creation fail on SUSE <= 12.2. + +(cannot find linuxdoc-sgml.sty; seems like /usr/lib/sgml-tool +is not in the search path with texlive 2011/suse122.) + +diff --git a/doc/Makefile b/doc/Makefile +index b92957e..1df6081 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6-flowlabels.ps ss.ps nstat.ps arpd.ps rt + + LATEX=latex + DVIPS=dvips +-SGML2DVI=sgml2latex ++SGML2DVI=sgml2latex --output=dvi + SGML2HTML=sgml2html -s 0 + LPR=lpr -Zsduplex + SHELL=bash +@@ -31,11 +31,8 @@ pdf: $(PDFFILES) + print: $(PSFILES) + $(LPR) $(PSFILES) + +-%.tex: %.sgml +- $(SGML2DVI) --output=tex $< +- + %.dvi: %.sgml +- $(SGML2DVI) --output=dvi $< ++ $(SGML2DVI) $< + + %.dvi: %.tex + @set -e; pass=2; echo "Running LaTeX $<"; \ +@@ -47,17 +44,10 @@ print: $(PSFILES) + echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ + done + +-%.pdf: %.tex +- @set -e; pass=2; echo "Running pdfLaTeX $<"; \ +- while [ `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 pdfLaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ +- done +-#%.pdf: %.ps +-# ps2pdf $< ++#%.pdf: %.tex ++# pdflatex $< ++%.pdf: %.ps ++ ps2pdf $< + + %.ps: %.dvi + $(DVIPS) $< -o $@