diff --git a/asciidoc-8.6.8.tar.gz b/asciidoc-8.6.8.tar.gz deleted file mode 100644 index 5d70a38..0000000 --- a/asciidoc-8.6.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4 -size 900422 diff --git a/asciidoc-8.6.9.tar.gz b/asciidoc-8.6.9.tar.gz new file mode 100644 index 0000000..6f9778d --- /dev/null +++ b/asciidoc-8.6.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 +size 907253 diff --git a/asciidoc-vim-fix.diff b/asciidoc-vim-fix.diff deleted file mode 100644 index 66ebcd8..0000000 --- a/asciidoc-vim-fix.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- a/vim/ftdetect/asciidoc_filetype.vim.orig 2012-10-27 14:12:14.513899686 +0200 -+++ b/vim/ftdetect/asciidoc_filetype.vim 2012-10-27 14:13:19.553561259 +0200 -@@ -10,8 +10,8 @@ - " The first sets asciidoc syntax highlighting on all .txt files, the second - " only existing files *.txt that appear to be AsciiDoc files. - --au BufNewFile,BufRead *.asciidoc,*.txt,README,TODO,CHANGELOG,NOTES setfiletype asciidoc --"au BufRead *.txt,README,TODO,CHANGELOG,NOTES call s:FTasciidoc() -+"au BufNewFile,BufRead *.asciidoc,*.txt,README,TODO,CHANGELOG,NOTES setfiletype asciidoc -+au BufRead *.txt,README,TODO,CHANGELOG,NOTES call s:FTasciidoc() - - " This function checks for a valid AsciiDoc document title after first - " skipping any leading comments. diff --git a/asciidoc.changes b/asciidoc.changes index fff4182..9aa00ae 100644 --- a/asciidoc.changes +++ b/asciidoc.changes @@ -1,3 +1,85 @@ +------------------------------------------------------------------- +Fri Mar 6 21:23:02 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Remove asciidoc-vim-fix.diff +- Update to 8.6.9 + * html5, xhtml11 and slidy outputs now wrap pre element contents at + right margin (see + [1]https://groups.google.com/group/asciidoc/browse_thread/thread/98 + 77a316b7a47309). + * Vim syntax file: highlight line breaks in lists (patch submitted by + Alex Efros). See + [2]https://groups.google.com/group/asciidoc/browse_thread/thread/51 + 45e4c0b65cde0a). + * Vim syntax file: fixed highlighting of lines with spaces preceding + an indented paragraph. See + [3]https://groups.google.com/group/asciidoc/browse_thread/thread/51 + 45e4c0b65cde0a + * Vim syntax file: dropped ) from list of illegal characters + following opening quote. See + [4]https://groups.google.com/group/asciidoc/browse_thread/thread/1a + 60eb4507a0555f/264c39c6a89fc7a0 + * Added + intrinsic attribute. See + [5]http://code.google.com/p/asciidoc/issues/detail?id=14 + * Allow tabsize=0 in configuration file. See + [6]https://groups.google.com/group/asciidoc/browse_thread/thread/c8 + 8457020288ce1d + * Removed wordpress backend into the blogpost project (where it + belongs) as an AsciiDoc backend plugin. + * Added HTML5 footer badges. + * Added favicon to AsciiDoc website. + * Changed AsciiDoc website domain to asciidoc.org. + * Vim syntax file: closing quote character cannot be immediately + followed by same closing quote character. + * Documentation updates. + * If admonition icons are embedded using the Data URI Scheme and the + icons directory is undefined or does not exist then the iconsdir + attribute is set to the location of the icons installed in the + AsciiDoc configuration directory. + * Updated ./stylesheets/pygments.css from pygments 1.4. + * HTML backends: Align inline images to text-bottom. + * html4 backend: Added hr attribute to make the inter-section + horizontal ruler element optional. + * Documented Callout lists cannot be used within tables. See: + [7]https://groups.google.com/group/asciidoc/browse_thread/thread/26 + 8f9b46ebc192d3 + * Removed Vim related stuff from the installer makefile. See: + [8]https://groups.google.com/group/asciidoc/browse_thread/thread/75 + 3a52b2af85fcfc/04c9091b0856fc13 and + [9]https://groups.google.com/group/asciidoc/browse_thread/thread/cd + 07629fa7a53fb3 + * Dropped vim/ftdetect/asciidoc_filetype.vim from distribution, the + file detection was broken and the default settings satisfied noone. + * Vim syntax highlighter: increase sync backtracking to catch changes + to large block elements. + * Added Romanian language configuration file. Contributed by Vitalie + Lazu. See + [10]https://groups.google.com/group/asciidoc/browse_thread/thread/2 + fe14a10dbf20d20/27726e7e13f7bfc7?lnk=gst&q=romanian#27726e7e13f7bfc + 7 + * Added ruler and line-break outputs to HTML Help outputs. Patch + submitted by DonM. See + [11]https://groups.google.com/group/asciidoc/browse_thread/thread/b + 131d0155eccd73e + * Added Czech language configuration file. Contributed by Petr Klíma. + * html4 backend: allow embedded images and icons (data-uri + attribute). + * html4 backend: table and example block caption place at bottom for + consistency. + * html4 backend: dropped border around example block. + * html4 backend: cellpaddings made equal to 4 for consistency. + * Vim syntax highligher: Highlight closing OpenBlock delimiter when + it immediately follows a list. + * Updated html5 backend (previous commit was xhtml11 only). See: + [12]https://groups.google.com/group/asciidoc/browse_thread/thread/d + bdfaf838f93e020 + * Embedded data-uri images now figure file mimetype from file + contents rather than the file extension. Patch submitted by Lex + Trotman. See: + [13]https://groups.google.com/group/asciidoc/browse_thread/thread/d + bdfaf838f93e0 + ------------------------------------------------------------------- Wed Mar 20 12:52:46 UTC 2013 - mmeister@suse.com diff --git a/asciidoc.spec b/asciidoc.spec index 1e53ae6..1402d2b 100644 --- a/asciidoc.spec +++ b/asciidoc.spec @@ -1,7 +1,7 @@ # # spec file for package asciidoc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,19 @@ Name: asciidoc +Version: 8.6.9 +Release: 0 Summary: Text-Based Document Generation License: GPL-2.0+ Group: Development/Tools/Doc Generators -Version: 8.6.8 -Release: 0 +Url: http://www.methods.co.nz/asciidoc/ +Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz Requires: docbook-xsl-stylesheets Requires: python >= 2.3 Requires: python-xml Recommends: dblatex # a2x needs /usr/bin/xsltproc Recommends: libxslt -Url: http://www.methods.co.nz/asciidoc/ -Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz -Patch0: asciidoc-vim-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -48,32 +47,30 @@ This package contains examples and documents of asciidoc. %prep %setup -q -%patch0 -p1 %build %install -mkdir -p $RPM_BUILD_ROOT/etc/asciidoc/filters -mkdir -p $RPM_BUILD_ROOT%{_datadir}/asciidoc -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0644 *.conf $RPM_BUILD_ROOT/etc/asciidoc -install -m 0644 filters/*/*.conf $RPM_BUILD_ROOT/etc/asciidoc/filters/ -install -m 0755 filters/*/*.py $RPM_BUILD_ROOT/etc/asciidoc/filters/ -install -m 0755 -D asciidoc.py $RPM_BUILD_ROOT%{_bindir}/asciidoc -install -m 0755 -D a2x.py $RPM_BUILD_ROOT%{_bindir}/a2x -install -m 0644 doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/ +mkdir -p %{buildroot}%{_sysconfdir}/asciidoc/filters +mkdir -p %{buildroot}%{_datadir}/asciidoc +mkdir -p %{buildroot}%{_mandir}/man1 +install -m 0644 *.conf %{buildroot}%{_sysconfdir}/asciidoc +install -m 0644 filters/*/*.conf %{buildroot}%{_sysconfdir}/asciidoc/filters/ +install -m 0755 filters/*/*.py %{buildroot}%{_sysconfdir}/asciidoc/filters/ +install -m 0755 -D asciidoc.py %{buildroot}%{_bindir}/asciidoc +install -m 0755 -D a2x.py %{buildroot}%{_bindir}/a2x +install -m 0644 doc/*.1 %{buildroot}%{_mandir}/man1/ for i in images stylesheets javascripts docbook-xsl dblatex; do - cp -av $i $RPM_BUILD_ROOT%{_datadir}/asciidoc/ - ln -s ../../%{_datadir}/asciidoc/$i $RPM_BUILD_ROOT/etc/asciidoc + cp -av $i %{buildroot}%{_datadir}/asciidoc/ + ln -s ../../%{_datadir}/asciidoc/$i %{buildroot}%{_sysconfdir}/asciidoc done # install vim files -mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/site/{syntax,ftdetect} -install -m 0644 vim/syntax/* $RPM_BUILD_ROOT%{_datadir}/vim/site/syntax -install -m 0644 vim/ftdetect/* $RPM_BUILD_ROOT%{_datadir}/vim/site/ftdetect +mkdir -p %{buildroot}%{_datadir}/vim/site/{syntax,ftdetect} +install -m 0644 vim/syntax/* %{buildroot}%{_datadir}/vim/site/syntax %files %defattr(-,root,root) -%config /etc/asciidoc +%config %{_sysconfdir}/asciidoc %{_datadir}/asciidoc %{_bindir}/* %{_datadir}/vim