diff --git a/SOURCES/asciidoc-8.6.8-explicit-interpreter.patch b/SOURCES/asciidoc-8.6.8-explicit-interpreter.patch new file mode 100644 index 0000000..dddde5a --- /dev/null +++ b/SOURCES/asciidoc-8.6.8-explicit-interpreter.patch @@ -0,0 +1,73 @@ +diff -up asciidoc-8.6.8/a2x.py.explicit-interpreter asciidoc-8.6.8/a2x.py +--- asciidoc-8.6.8/a2x.py.explicit-interpreter 2014-02-10 17:09:28.400042041 +0100 ++++ asciidoc-8.6.8/a2x.py 2014-02-10 17:16:54.945502122 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + ''' + a2x - A toolchain manager for AsciiDoc (converts Asciidoc text files to other + file formats) +diff -up asciidoc-8.6.8/asciidocapi.py.explicit-interpreter asciidoc-8.6.8/asciidocapi.py +--- asciidoc-8.6.8/asciidocapi.py.explicit-interpreter 2012-02-29 23:21:24.000000000 +0100 ++++ asciidoc-8.6.8/asciidocapi.py 2014-02-10 17:16:54.932502080 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + """ + asciidocapi - AsciiDoc API wrapper class. + +diff -up asciidoc-8.6.8/asciidoc.py.explicit-interpreter asciidoc-8.6.8/asciidoc.py +--- asciidoc-8.6.8/asciidoc.py.explicit-interpreter 2012-07-10 04:47:22.000000000 +0200 ++++ asciidoc-8.6.8/asciidoc.py 2014-02-10 17:16:54.960502172 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + """ + asciidoc - converts an AsciiDoc text file to HTML or DocBook + +diff -up asciidoc-8.6.8/filters/code/code-filter.py.explicit-interpreter asciidoc-8.6.8/filters/code/code-filter.py +--- asciidoc-8.6.8/filters/code/code-filter.py.explicit-interpreter 2008-12-31 02:37:47.000000000 +0100 ++++ asciidoc-8.6.8/filters/code/code-filter.py 2014-02-10 17:16:54.939502103 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + ''' + NAME + code-filter - AsciiDoc filter to highlight language keywords +diff -up asciidoc-8.6.8/filters/graphviz/graphviz2png.py.explicit-interpreter asciidoc-8.6.8/filters/graphviz/graphviz2png.py +--- asciidoc-8.6.8/filters/graphviz/graphviz2png.py.explicit-interpreter 2011-01-31 21:52:09.000000000 +0100 ++++ asciidoc-8.6.8/filters/graphviz/graphviz2png.py 2014-02-10 17:16:54.941502110 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + + import os, sys, subprocess + from optparse import * +diff -up asciidoc-8.6.8/filters/latex/latex2png.py.explicit-interpreter asciidoc-8.6.8/filters/latex/latex2png.py +--- asciidoc-8.6.8/filters/latex/latex2png.py.explicit-interpreter 2012-02-29 03:05:58.000000000 +0100 ++++ asciidoc-8.6.8/filters/latex/latex2png.py 2014-02-10 17:16:54.936502093 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + ''' + NAME + latex2png - Converts LaTeX source to PNG file +diff -up asciidoc-8.6.8/filters/music/music2png.py.explicit-interpreter asciidoc-8.6.8/filters/music/music2png.py +--- asciidoc-8.6.8/filters/music/music2png.py.explicit-interpreter 2012-07-10 23:32:19.000000000 +0200 ++++ asciidoc-8.6.8/filters/music/music2png.py 2014-02-10 17:16:54.934502087 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + ''' + NAME + music2png - Converts textual music notation to classically notated PNG file +diff -up asciidoc-8.6.8/tests/asciidocapi.py.explicit-interpreter asciidoc-8.6.8/tests/asciidocapi.py +diff -up asciidoc-8.6.8/tests/testasciidoc.py.explicit-interpreter asciidoc-8.6.8/tests/testasciidoc.py +--- asciidoc-8.6.8/tests/testasciidoc.py.explicit-interpreter 2012-03-01 00:19:57.000000000 +0100 ++++ asciidoc-8.6.8/tests/testasciidoc.py 2014-02-10 17:16:54.965502188 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + + USAGE = '''Usage: testasciidoc.py [OPTIONS] COMMAND + diff --git a/SPECS/asciidoc.spec b/SPECS/asciidoc.spec index 6e864ec..fcb12eb 100644 --- a/SPECS/asciidoc.spec +++ b/SPECS/asciidoc.spec @@ -4,7 +4,7 @@ Summary: Text based document generation Name: asciidoc Version: 8.6.8 -Release: 2%{?dist} +Release: 5%{?dist} # The python code does not specify a version. # The javascript example code is GPLv2+. License: GPL+ and GPLv2+ @@ -13,6 +13,7 @@ Group: Applications/System URL: http://www.methods.co.nz/asciidoc/ Source: http://sourceforge.net/projects/asciidoc/files/%{name}/%{version}/%{name}-%{version}.tar.gz Patch0: asciidoc-8.6.8-music-noship.patch +Patch1: asciidoc-8.6.8-explicit-interpreter.patch BuildRequires: python2-devel BuildRequires: dblatex @@ -24,6 +25,7 @@ BuildRequires: lilypond BuildRequires: source-highlight BuildRequires: texlive-dvipng-bin BuildRequires: vim-filesystem +BuildRequires: symlinks Requires: python >= 2.4 @@ -70,6 +72,7 @@ Requires: lilypond %prep %setup -q %patch0 -p1 -b .music-noship +%patch1 -p1 -b .explicit-interpreter # Fix line endings on COPYRIGHT file sed -i "s/\r//g" COPYRIGHT @@ -95,11 +98,13 @@ install -dm 755 %{buildroot}%{_datadir}/asciidoc/ for d in dblatex docbook-xsl images javascripts stylesheets; do mv -v %{buildroot}%{_sysconfdir}/asciidoc/$d \ %{buildroot}%{_datadir}/asciidoc/ - ln -s %{_datadir}/%{name}/$d %{buildroot}%{_sysconfdir}/%{name}/ + # absolute symlink into buildroot is intentional, see below + ln -s %{buildroot}%{_datadir}/%{name}/$d %{buildroot}%{_sysconfdir}/%{name}/ # let's symlink stuff for documentation as well so we don't duplicate things rm -rf %{buildroot}%{_docdir}/%{name}/$d - ln -s %{_datadir}/%{name}/$d %{buildroot}%{_docdir}/%{name}/ + # absolute symlink into buildroot is intentional, see below + ln -s %{buildroot}%{_datadir}/%{name}/$d %{buildroot}%{_docdir}/%{name}/ done # Python API @@ -120,6 +125,10 @@ done rm -rf %{buildroot}{%{_sysconfdir}/asciidoc/filters/music,%{_sysconfdir}/asciidoc/filters/music/*.conf,%{_sysconfdir}/asciidoc/filters/music/*.py} %endif +# Absolute symlinks were used above to be able to detect dangling ones. Make +# them relative now (sane for being installed) and remove dangling symlinks. +symlinks -cdr %{buildroot} + %check export PATH="../:$PATH" cd tests @@ -162,6 +171,13 @@ python testasciidoc.py run %changelog +* Mon Feb 10 2014 Nils Philippsen - 8.6.8-5 +- explicitly use system copy of Python 2.x (#987011) +- fix broken and remove dangling symlinks + +* Fri Dec 27 2013 Daniel Mach - 8.6.8-3 +- Mass rebuild 2013-12-27 + * Thu Oct 3 2013 Paul W. Frields - 8.6.8-2 - Do not build or test musicfilter