From c7abc941a4c06cc6d4e8a282e2e0036fb08f3bc0 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Mar 08 2013 09:00:21 +0000 Subject: Update to latest upstream version - Move things around make docs dir actually working - Add proper requires on vim-filesystem - Run testsuite - Split music and latex support to subpackages --- diff --git a/.gitignore b/.gitignore index 470e608..88767e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ asciidoc-8.4.5.tar.gz +/asciidoc-8.6.8.tar.gz diff --git a/asciidoc-8.4.5-datadir.patch b/asciidoc-8.4.5-datadir.patch deleted file mode 100644 index 5e34ee2..0000000 --- a/asciidoc-8.4.5-datadir.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -up asciidoc-8.4.5/asciidoc.py.datadir asciidoc-8.4.5/asciidoc.py ---- asciidoc-8.4.5/asciidoc.py.datadir 2009-05-26 05:12:38.000000000 +0300 -+++ asciidoc-8.4.5/asciidoc.py 2009-09-08 00:25:23.000000000 +0300 -@@ -651,6 +651,8 @@ def filter_lines(filter_cmd, lines, attr - if not found: - found = findfilter(filtername, CONF_DIR, cmd) - if not found: -+ found = findfilter(filtername, DATA_DIR, cmd) -+ if not found: - found = findfilter(filtername, APP_DIR, cmd) - else: - if os.path.isfile(cmd): -@@ -4997,6 +4999,7 @@ APP_DIR = None # This file' - USER_DIR = None # ~/.asciidoc - # Global configuration files directory (set by Makefile build target). - CONF_DIR = '/etc/asciidoc' -+DATA_DIR = '/usr/share/asciidoc' - HELP_FILE = 'help.conf' # Default (English) help file. - - # Globals -diff -up asciidoc-8.4.5/Makefile.in.datadir asciidoc-8.4.5/Makefile.in ---- asciidoc-8.4.5/Makefile.in.datadir 2009-04-24 01:49:43.000000000 +0300 -+++ asciidoc-8.4.5/Makefile.in 2009-09-08 00:28:23.000000000 +0300 -@@ -23,6 +23,7 @@ srcdir = @srcdir@ - VPATH = @srcdir@ - - ASCIIDOCCONF = $(sysconfdir)/asciidoc -+ASCIIDOCDATA = $(datadir)/asciidoc - - prog = asciidoc.py a2x - progdir = $(bindir) -@@ -35,25 +36,26 @@ manpdir = $(mandir)/man1 - conf = $(wildcard *.conf) - confdir = $(ASCIIDOCCONF) - --filtersdir = $(ASCIIDOCCONF)/filters -+filtersdir = $(ASCIIDOCDATA)/filters -+filtersconfdir = $(ASCIIDOCCONF)/filters - - codefilter = filters/code/code-filter.py - codefilterdir = $(filtersdir)/code - codefilterconf = filters/code/code-filter.conf --codefilterconfdir = $(filtersdir)/code -+codefilterconfdir = $(filtersconfdir)/code - - graphvizfilter = filters/graphviz/graphviz2png.py - graphvizfilterdir = $(filtersdir)/graphviz - graphvizfilterconf = filters/graphviz/graphviz-filter.conf --graphvizfilterconfdir = $(filtersdir)/graphviz -+graphvizfilterconfdir = $(filtersconfdir)/graphviz - - musicfilter = filters/music/music2png.py - musicfilterdir = $(filtersdir)/music - musicfilterconf = filters/music/music-filter.conf --musicfilterconfdir = $(filtersdir)/music -+musicfilterconfdir = $(filtersconfdir)/music - - sourcefilterconf = filters/source/source-highlight-filter.conf --sourcefilterconfdir = $(filtersdir)/source -+sourcefilterconfdir = $(filtersconfdir)/source - - docbook = $(wildcard docbook-xsl/*.xsl) - docbookdir = $(ASCIIDOCCONF)/docbook-xsl -@@ -126,6 +128,13 @@ fixconfpath: - mv $$f.out $$f; \ - done - -+fixdatapath: -+ @for f in $(prog); do \ -+ echo "Fixing DATA_DIR in $$f"; \ -+ $(SED) "s#^DATA_DIR = '.*'#DATA_DIR = '$(ASCIIDOCDATA)'#; s#^DATA_DIR=.*#DATA_DIR=$(ASCIIDOCDATA)#" $$f > $$f.out; \ -+ mv $$f.out $$f; \ -+ done -+ - install-vim: - @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \ - if ! test -d $$d; then continue; fi ; \ -@@ -145,7 +154,7 @@ uninstall-vim: - done - - --build: fixconfpath -+build: fixconfpath fixdatapath - - install: all $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim - diff --git a/asciidoc-8.4.5-use-unsafe-mode-by-default.patch b/asciidoc-8.4.5-use-unsafe-mode-by-default.patch deleted file mode 100644 index 0d93cc6..0000000 --- a/asciidoc-8.4.5-use-unsafe-mode-by-default.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up asciidoc-8.4.5/asciidoc.py.default-unsafe asciidoc-8.4.5/asciidoc.py ---- asciidoc-8.4.5/asciidoc.py.default-unsafe 2009-05-25 22:12:38.000000000 -0400 -+++ asciidoc-8.4.5/asciidoc.py 2009-07-16 02:27:09.000000000 -0400 -@@ -1138,7 +1138,7 @@ class Document: - self.level = 0 # 0 => front matter. 1,2,3 => sect1,2,3. - self.has_errors = False # Set true if processing errors were flagged. - self.has_warnings = False # Set true if warnings were flagged. -- self.safe = True # Default safe mode. -+ self.safe = False # Default safe mode. - def update_attributes(self): - # Set implicit attributes. - if self.infile and os.path.exists(self.infile): -@@ -5205,8 +5205,8 @@ def execute(cmd,opts,args): - for o,v in opts: - if o in ('--help','-h'): - help_option = True -- if o == '--unsafe': -- document.safe = False -+ if o == '--safe': -+ document.safe = True - if o == '--version': - print('asciidoc %s' % VERSION) - sys.exit(0) -diff -up asciidoc-8.4.5/doc/asciidoc.1.default-unsafe asciidoc-8.4.5/doc/asciidoc.1 ---- asciidoc-8.4.5/doc/asciidoc.1.default-unsafe 2009-05-26 02:38:36.000000000 -0400 -+++ asciidoc-8.4.5/doc/asciidoc.1 2009-08-12 23:51:09.000000000 -0400 -@@ -123,9 +123,9 @@ Auto\-number HTML article section titles - \fB\-a numbered\fR\. - .RE - .PP --\fB\-\-unsafe\fR -+\fB\-\-safe\fR - .RS 4 --Disable safe mode\. Safe mode is enabled by default, disabling it is potentially dangerous\. -+Enable safe mode\. Safe mode is disabled by default\. - .RE - .PP - \fB\-v, \-\-verbose\fR diff --git a/asciidoc.spec b/asciidoc.spec index 37756dd..333f5ee 100644 --- a/asciidoc.spec +++ b/asciidoc.spec @@ -1,35 +1,70 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%global vimdir %{_datadir}/vim/vimfiles Summary: Text based document generation Name: asciidoc -Version: 8.4.5 -Release: 9%{?dist} +Version: 8.6.8 +Release: 1%{?dist} # The python code does not specify a version. # The javascript example code is GPLv2+. License: GPL+ and GPLv2+ Group: Applications/System + URL: http://www.methods.co.nz/asciidoc/ -Source0: http://www.methods.co.nz/asciidoc/%{name}-%{version}.tar.gz -# http://groups.google.com/group/asciidoc/browse_thread/thread/7f7a633c5b11ddc3 -Patch0: asciidoc-8.4.5-datadir.patch -# https://bugzilla.redhat.com/506953 -Patch1: asciidoc-8.4.5-use-unsafe-mode-by-default.patch -BuildRequires: python >= 2.4 +Source: http://sourceforge.net/projects/asciidoc/files/%{name}/%{version}/%{name}-%{version}.tar.gz + +BuildRequires: python2-devel +BuildRequires: dblatex +BuildRequires: graphviz +BuildRequires: libxslt +BuildRequires: lilypond +BuildRequires: source-highlight +BuildRequires: texlive-dvipng-bin +BuildRequires: vim-filesystem + + Requires: python >= 2.4 Requires: docbook-style-xsl +Requires: graphviz +Requires: libxslt Requires: libxslt +Requires: source-highlight +Requires: vim-filesystem + BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages. AsciiDoc files can be translated to HTML and DocBook markups using the asciidoc(1) command. +%package doc +Summary: Additional documentation and examples for asciidoc +Requires: %{name} = %{version}-%{release} + +%description doc +%{summary}. + +%package latex +Summary: Support for asciidoc latex output +Requires: %{name} = %{version}-%{release} +Requires: dblatex +Requires: texlive-dvipng-bin + +%description latex +%{summary}. + +%package music +Summary: Support for asciidoc music output +Requires: %{name} = %{version}-%{release} +Requires: lilypond + +%description music +%{summary}. + + %prep %setup -q -%patch0 -p1 -b .datadir -%patch1 -p1 -b .use-unsafe-mode-by-default # Fix line endings on COPYRIGHT file sed -i "s/\r//g" COPYRIGHT @@ -45,40 +80,81 @@ done %configure %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +make install docs DESTDIR=%{buildroot} +install -dm 755 %{buildroot}%{_datadir}/asciidoc/ # real conf data goes to sysconfdir, rest to datadir; symlinks so asciidoc works -for d in dblatex docbook-xsl images javascripts stylesheets ; do - mv %{buildroot}%{_sysconfdir}/asciidoc/$d \ - %{buildroot}%{_datadir}/asciidoc - ln -s %{_datadir}/asciidoc/$d %{buildroot}%{_sysconfdir}/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}/ + + # 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}/ done # Python API install -Dpm 644 asciidocapi.py %{buildroot}%{python_sitelib}/asciidocapi.py # Make it easier to %exclude these with both rpm < and >= 4.7 -for file in %{buildroot}{%{_bindir},%{_datadir}/asciidoc/filters/*}/*.py ; do +for file in %{buildroot}{%{_bindir},%{_sysconfdir}/asciidoc/filters/*}/*.py ; do touch ${file}{c,o} done +mkdir -p %{buildroot}%{vimdir}/{ftdetect,syntax} +for file in $(cd vim; find * -type f); do + install -m 0644 vim/$file %{buildroot}%{vimdir}/$file +done -%clean -rm -rf %{buildroot} +%check +export PATH="../:$PATH" +cd tests +python testasciidoc.py update +python testasciidoc.py run %files -%defattr(-,root,root,0755) -%config(noreplace) %{_sysconfdir}/asciidoc -%exclude %{_bindir}/*.py[co] -%{_bindir}/* -%{_mandir}/man1/* +%doc COPYING COPYRIGHT BUGS CHANGELOG README +%doc %{_mandir}/man1/a2x.1* +%doc %{_mandir}/man1/asciidoc.1* +%config(noreplace) %{_sysconfdir}/asciidoc/ +%{_bindir}/a2x +%{_bindir}/a2x.py +%{_bindir}/asciidoc +%{_bindir}/asciidoc.py %{_datadir}/asciidoc/ -%exclude %{_datadir}/asciidoc/filters/*/*.py[co] %{python_sitelib}/asciidocapi.py* -%doc README BUGS CHANGELOG COPYRIGHT +%{vimdir}/ftdetect/asciidoc_filetype.vim +%{vimdir}/syntax/asciidoc.vim +%exclude %{_bindir}/*.py[co] +%exclude %{_sysconfdir}/asciidoc/filters/*/*.py[co] +%exclude %{_sysconfdir}/asciidoc/filters/latex +%exclude %{_sysconfdir}/asciidoc/filters/music + +%files doc +%{_docdir}/%{name} +%exclude %{_docdir}/%{name}/{BUGS,CHANGELOG,COPYING,COPYRIGHT,README} + +%files latex +%dir %{_sysconfdir}/asciidoc/filters/latex +%{_sysconfdir}/asciidoc/filters/latex/*.py +%{_sysconfdir}/asciidoc/filters/latex/*.conf + +%files music +%dir %{_sysconfdir}/asciidoc/filters/music +%{_sysconfdir}/asciidoc/filters/music/*.conf +%{_sysconfdir}/asciidoc/filters/music/*.py + + %changelog +* Thu Mar 7 2013 Stanislav Ochotnicky - 8.6.8-1 +- Update to latest upstream version +- Move things around make docs dir actually working +- Add proper requires on vim-filesystem +- Run testsuite +- Split music and latex support to subpackages + * Wed Feb 13 2013 Fedora Release Engineering - 8.4.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -162,7 +238,7 @@ rm -rf %{buildroot} - Build as noarch (Petr Klíma) * Sat Jun 11 2005 Terje Røsten - 7.0.0-0.3 -- Add include patch +- Add include patch * Fri Jun 10 2005 Terje Røsten - 7.0.0-0.2 - Fix stylesheets according to Stuart diff --git a/sources b/sources index 2300c66..56361ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f21d6e352b3ab668f9def3eb7497da2 asciidoc-8.4.5.tar.gz +6ffff1ab211f30481741ce4d1e4b12bf asciidoc-8.6.8.tar.gz