pool/asciidoc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 532093 from Publishing

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/532093
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/asciidoc?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2017-10-10 09:37:32 +00:00 committed by Git OBS Bridge
commit c8a4b291bd
6 changed files with 97 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
asciidoc-8.6.10.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9e52f8578d891beaef25730a92a6e723596ddbd07bfe0d2a56486fcf63a0b983
size 577208

3
asciidoc-8.6.9.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0
size 907253

260
asciidoc-change-Last-Updated-field.patch
View File

@ -1,260 +0,0 @@
From 9a2f59e74dde8b0df1acdfc2dde40a0a868a16a8 Mon Sep 17 00:00:00 2001
From: Joseph HERLANT <herlantj@gmail.com>
Date: Fri, 14 Feb 2014 15:56:45 +0100
Subject: Adding the ability to change "Last Updated" field
This commit adds the ability to change the behavior of the "Last Updated"
field at the bottom of the html documents generated by asciidoc.
This will be done by using the "footer-style" new attribute.
This commit adds the ability to change it to the revision date or to skip it.
This commit also adds the documentation of this new feature to the user guide.
---
doc/asciidoc.txt | 16 ++++++++++++++++
html4.conf | 13 +++++++++++++
html5.conf | 13 +++++++++++++
lang-cs.conf | 3 ++-
lang-de.conf | 3 ++-
lang-el.conf | 3 ++-
lang-en.conf | 3 ++-
lang-es.conf | 3 ++-
lang-fr.conf | 3 ++-
lang-hu.conf | 3 ++-
lang-nl.conf | 3 ++-
lang-uk.conf | 3 ++-
xhtml11.conf | 13 +++++++++++++
13 files changed, 73 insertions(+), 9 deletions(-)
--- a/doc/asciidoc.txt
+++ b/doc/asciidoc.txt
@@ -5948,6 +5948,22 @@ A short summary of changes in this docum
prior to the first document section. The document also needs to be
dated to output this attribute.
+|footer-style |html4, html5, xhtml11 |
+Changes the "Last updated" field in the footer of the document or removes this
+field and the revision number (in the footer only). +
+Can take 3 values:
+
+- none : Don't display the "Last updated" and "Revision number" fields in the
+ footer of the document
+- revdate : The "Last updated" field's date in the footer will be the revision
+ date specified in the document (`revdate` attribute)
+- default (or any other value) : The "Last updated" field's date in the footer
+ will be the date of the input file modification
+
+This attribute can be set, for example, using `:footer-style: revdate` in the
+header of the file or using the `--attribute footer-style=revdate` command-line
+option.
+
|scriptsdir |html5, xhtml11 |
The name of the directory containing linked JavaScripts.
See <<X35,HTML stylesheets and JavaScript locations>>.
--- a/html4.conf
+++ b/html4.conf
@@ -444,11 +444,14 @@ cellspacing="0" cellpadding="4">
|
[footer]
+# Removing footer date and version if footer-style set to none
+ifeval::["{footer-style=default}"!="none"]
<p></p>
<p></p>
<hr><p><small>
template::[footer-text]
</small></p>
+endif::[]
</body>
</html>
@@ -467,6 +470,16 @@ template::[footer-text]
template::[docinfo]
</head>
+[footer-date]
+# Default footer date is document modification time
+ifeval::["{footer-style=default}"!="revdate"]
+ {docdate} {doctime}
+endif::[]
+# If set to "revdate", it'll be set to the revision date
+ifeval::["{footer-style=default}"=="revdate"]
+ {revdate}
+endif::[]
+
#--------------------------------
# article and book document types
#--------------------------------
--- a/html5.conf
+++ b/html5.conf
@@ -662,9 +662,12 @@ endif::doctype-manpage[]
</div>
{disable-javascript%<div id="footnotes"><hr></div>}
<div id="footer">
+# Removing footer date and version if footer-style set to none
+ifeval::["{footer-style=default}"!="none"]
<div id="footer-text">
template::[footer-text]
</div>
+endif::[]
ifdef::badges[]
<div id="footer-badges">
ifndef::icons[]
@@ -688,6 +691,16 @@ endif::badges[]
</body>
</html>
+[footer-date]
+# Default footer date is document modification time
+ifeval::["{footer-style=default}"!="revdate"]
+ {docdate} {doctime}
+endif::[]
+# If set to "revdate", it'll be set to the revision date
+ifeval::["{footer-style=default}"=="revdate"]
+ {revdate}
+endif::[]
+
ifdef::doctype-manpage[]
[synopsis]
template::[sect1]
--- a/lang-cs.conf
+++ b/lang-cs.conf
@@ -23,7 +23,8 @@ manname-title=NAME
[footer-text]
Verze {revnumber}{basebackend-xhtml11?<br />}{basebackend-xhtml11=<br>}
-Poslední úprava {docdate} {doctime}
+Poslední úprava
+template::[footer-date]
endif::basebackend-html[]
--- a/lang-de.conf
+++ b/lang-de.conf
@@ -29,7 +29,8 @@ manname-title=NAME
[footer-text]
Version {revnumber}{basebackend-xhtml11?<br />}{basebackend-xhtml11=<br>}
-Letzte Änderung {docdate} {doctime}
+Letzte Änderung
+template::[footer-date]
endif::basebackend-html[]
--- a/lang-el.conf
+++ b/lang-el.conf
@@ -23,7 +23,8 @@ manname-title=ΌΝΟΜΑ
[footer-text]
Έκδοση {revnumber}{basebackend-xhtml11?<br />}{basebackend-xhtml11=<br>}
-Τελευταία αναθεώρηση {docdate} {doctime}
+Τελευταία αναθεώρηση
+template::[footer-date]
endif::basebackend-html[]
--- a/lang-en.conf
+++ b/lang-en.conf
@@ -22,7 +22,8 @@ manname-title=NAME
[footer-text]
Version {revnumber}{basebackend-xhtml11?<br />}{basebackend-xhtml11=<br>}
-Last updated {docdate} {doctime}
+Last updated
+template::[footer-date]
endif::basebackend-html[]
--- a/lang-es.conf
+++ b/lang-es.conf
@@ -25,7 +25,8 @@ manname-title=NOMBRE DE REFERENCIA
[footer-text]
#TODO: Translation of 'Version' and 'Last updated'.
Version {revnumber}{basebackend-xhtml11?<br />}{basebackend-xhtml11=<br>}
-Last updated {docdate} {doctime}
+Last updated
+template::[footer-date]
endif::basebackend-html[]
--- a/lang-fr.conf
+++ b/lang-fr.conf
@@ -27,7 +27,8 @@ manname-title=NOM
[footer-text]
Version {revnumber}{basebackend-xhtml11?<br />}{basebackend-xhtml11=<br>}
-Dernière mise à jour {docdate} {doctime}
+Dernière mise à jour
+template::[footer-date]
endif::basebackend-html[]
--- a/lang-hu.conf
+++ b/lang-hu.conf
@@ -25,7 +25,8 @@ manname-title=NÉV
[footer-text]
Verzió {revnumber}{basebackend-xhtml11?<br />}{basebackend-xhtml11=<br>}
-Utolsó frissítés: {docdate} {doctime}
+Utolsó frissítés:
+template::[footer-date]
endif::basebackend-html[]
--- a/lang-nl.conf
+++ b/lang-nl.conf
@@ -29,7 +29,8 @@ manname-title=NAME
[footer-text]
Versie {revnumber}{basebackend-xhtml11?<br />}{basebackend-xhtml11=<br>}
-Laatst bijgewerkt {docdate} {doctime}
+Laatst bijgewerkt
+template::[footer-date]
endif::basebackend-html[]
--- a/lang-uk.conf
+++ b/lang-uk.conf
@@ -28,7 +28,8 @@ manname-title=НАЗВА
[footer-text]
#TODO: Translation of 'Version' and 'Last updated'.
Version {revnumber}{basebackend-xhtml11?<br />}{basebackend-xhtml11=<br>}
-Last updated {docdate} {doctime}
+Last updated
+template::[footer-date]
endif::basebackend-html[]
--- a/xhtml11.conf
+++ b/xhtml11.conf
@@ -657,9 +657,12 @@ endif::doctype-manpage[]
</div>
{disable-javascript%<div id="footnotes"><hr /></div>}
<div id="footer">
+# Removing footer date and version if footer-style set to none
+ifeval::["{footer-style=default}"!="none"]
<div id="footer-text">
template::[footer-text]
</div>
+endif::[]
ifdef::badges[]
<div id="footer-badges">
ifndef::icons[]
@@ -684,6 +687,16 @@ endif::badges[]
</body>
</html>
+[footer-date]
+# Default footer date is document modification time
+ifeval::["{footer-style=default}"!="revdate"]
+ {docdate} {doctime}
+endif::[]
+# If set to "revdate", it'll be set to the revision date
+ifeval::["{footer-style=default}"=="revdate"]
+ {revdate}
+endif::[]
+
ifdef::doctype-manpage[]
[synopsis]
template::[sect1]

23
asciidoc.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri Oct 6 03:01:43 UTC 2017 - bwiedemann@suse.com
- Re-add documentation
-------------------------------------------------------------------
Wed Oct 4 09:21:58 UTC 2017 - olaf@aepfle.de
- Remove asciidoc version from generated files with asciidoc.version.patch
The version causes unneeded republish of pkgs that make use
of asciidoc
-------------------------------------------------------------------
Sun Oct 1 13:41:40 UTC 2017 - aavindraa@gmail.com
- Update to 8.6.10
* Improve reproducibility of builds (e.g. support SOURCE_DATE_EPOCH)
* SVG output support
* documentation and translations
- Lint spec file
- Remove asciidoc-change-Last-Updated-field.patch
* merged in https://github.com/asciidoc/asciidoc/pull/9
-------------------------------------------------------------------
Fri Jul 7 09:59:32 UTC 2017 - matthias.gerstner@suse.com

49
asciidoc.spec
View File

@ -17,21 +17,25 @@
Name: asciidoc
Version: 8.6.9
Version: 8.6.10
Release: 0
Summary: Text-Based Document Generation
License: GPL-2.0+
Group: Development/Tools/Doc Generators
Url: http://www.methods.co.nz/asciidoc/
Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
Patch0: asciidoc-change-Last-Updated-field.patch
Url: http://asciidoc.org
Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: asciidoc.version.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: python >= 2.3
BuildRequires: python-xml
Requires: docbook-xsl-stylesheets
Requires: python >= 2.3
Requires: python-xml
Recommends: dblatex
# a2x needs /usr/bin/xsltproc
Recommends: libxslt
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@ -51,36 +55,31 @@ This package contains examples and documents of asciidoc.
%patch0 -p1
%build
autoreconf -fi
%configure
%install
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 themes; do
cp -av $i %{buildroot}%{_datadir}/asciidoc/
ln -s ../../%{_datadir}/asciidoc/$i %{buildroot}%{_sysconfdir}/asciidoc
done
%make_install
# Strip .py extension from binaries
pushd %{buildroot}%{_bindir}
mv %{name}.py %{name}
mv a2x.py a2x
popd
# install vim files
mkdir -p %{buildroot}%{_datadir}/vim/site/{syntax,ftdetect}
install -m 0644 vim/syntax/* %{buildroot}%{_datadir}/vim/site/syntax
%files
%defattr(-,root,root)
%config %{_sysconfdir}/asciidoc
%{_datadir}/asciidoc
%{_bindir}/*
%config %{_sysconfdir}/%{name}
%{_bindir}/%{name}
%{_bindir}/a2x
%{_datadir}/vim
%doc %{_mandir}/man1/*
%doc README BUGS CHANGELOG COPYRIGHT
%{_mandir}/man1/*
%doc README.asciidoc BUGS.txt CHANGELOG.txt COPYRIGHT
%files examples
%defattr(-,root,root)
%doc doc examples
%changelog

47
asciidoc.version.patch Normal file
View File

@ -0,0 +1,47 @@
Avoid version number in generated files.
Output will be identical between versions.
In case the output changes, build-compare will catch it.
--- a/html4.conf
+++ b/html4.conf
@@ -460,7 +460,7 @@ endif::[]
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset={encoding}">
-<meta name="generator" content="AsciiDoc {asciidoc-version}">
+<meta name="generator" content="AsciiDoc">
<meta name="description" content="{description}">
<meta name="keywords" content="{keywords}">
<title>{title}</title>
--- a/html5.conf
+++ b/html5.conf
@@ -539,7 +539,7 @@ bodydata=<td class="tableblock halign-{c
<html lang="{lang=en}">
<head>
<meta http-equiv="Content-Type" content="text/html; charset={encoding}">
-<meta name="generator" content="AsciiDoc {asciidoc-version}">
+<meta name="generator" content="AsciiDoc">
<meta name="description" content="{description}">
<meta name="keywords" content="{keywords}">
<title>{title}</title>
--- a/slidy.conf
+++ b/slidy.conf
@@ -68,7 +68,7 @@ text=<p>|</p>
<meta http-equiv="Content-Type" content="{quirks=application/xhtml+xml}{quirks?text/html}; charset={encoding}" />
ifndef::copyright[<meta name="copyright" content="Copyright &#169; {author}" />]
<meta name="copyright" content="Copyright &#169; {copyright}" />
-<meta name="generator" content="AsciiDoc {asciidoc-version}" />
+<meta name="generator" content="AsciiDoc" />
<meta name="duration" content="{duration}" />
ifdef::linkcss[]
<link rel="stylesheet" href="{stylesdir=.}/{theme=asciidoc}.css" type="text/css" />
--- a/xhtml11.conf
+++ b/xhtml11.conf
@@ -531,7 +531,7 @@ cellspacing="0" cellpadding="4">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{lang=en}">
<head>
<meta http-equiv="Content-Type" content="{quirks=application/xhtml+xml}{quirks?text/html}; charset={encoding}" />
-<meta name="generator" content="AsciiDoc {asciidoc-version}" />
+<meta name="generator" content="AsciiDoc" />
<meta name="description" content="{description}" />
<meta name="keywords" content="{keywords}" />
<title>{title}</title>