[asciidoc] Update to latest upstream version

Fri Mar 8 09:15:51 UTC 2013

commit c7abc941a4c06cc6d4e8a282e2e0036fb08f3bc0
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Mar 7 13:58:09 2013 +0100

    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

 .gitignore                                      |    1 +
 asciidoc-8.4.5-datadir.patch                    |   86 ---------------
 asciidoc-8.4.5-use-unsafe-mode-by-default.patch |   38 -------
 asciidoc.spec                                   |  132 ++++++++++++++++++-----
 sources                                         |    2 +-
 5 files changed, 106 insertions(+), 153 deletions(-)
---

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.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 <sochotnicky at redhat.com> - 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 <rel-eng at lists.fedoraproject.org> - 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 <terje.rosten at ntnu.no> - 7.0.0-0.3
-- Add include patch 
+- Add include patch
 
 * Fri Jun 10 2005 Terje Røsten <terje.rosten at ntnu.no> - 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
