OBS User unknown 2008-07-08 13:59:08 +00:00 committed by Git OBS Bridge
parent 01f3781003
commit acd4d2f322
6 changed files with 87 additions and 42 deletions

View File

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

3
asciidoc-8.2.7.tar.bz2 Normal file
View File

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

View File

@ -1,20 +1,15 @@
--- a2x-dist 2008-01-14 12:56:00.000000000 +0100
+++ a2x 2008-01-14 12:56:10.000000000 +0100
@@ -502,7 +502,7 @@
function to_pdf()
{
require "xsltproc"
- require "fop.sh"
+ require "fop"
local xsl xml fo pdf
xsl=$(conf_file docbook-xsl/fo.xsl)
if [ ! -r "$xsl" ]; then
@@ -514,7 +514,7 @@
to_docbook
execute_command_2 "xsltproc $XSLTPROC_OPTS --nonet \
\"$xsl\" \"$xml\" >\"$fo\""
- execute_command_2 "fop.sh \"$fo\" \"$pdf\""
+ execute_command_2 "fop \"$fo\" \"$pdf\""
}
---
a2x | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
function to_odt()
--- a/a2x
+++ b/a2x
@@ -15,7 +15,7 @@ if [ ! -e "$REALNAME" ]; then
fi
REALNAME="$(readlink -f "$REALNAME")"
CONF_DIR=/etc/asciidoc
-FOP_COMMAND="fop.sh" # FOP executable.
+FOP_COMMAND="fop" # FOP executable.
#--------------------------------------------------------------------
# Constants.

View File

@ -1,12 +0,0 @@
diff -Naur ../asciidoc-8.2.5.orig/docbook-xsl/fo.xsl ./docbook-xsl/fo.xsl
--- ../asciidoc-8.2.5.orig/docbook-xsl/fo.xsl 2007-10-29 04:50:53.000000000 +0100
+++ ./docbook-xsl/fo.xsl 2008-01-30 17:21:18.000000000 +0100
@@ -14,7 +14,7 @@
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
<xsl:import href="common.xsl"/>
-<xsl:param name="fop.extensions" select="1" />
+<xsl:param name="fop1.extensions" select="1" />
<xsl:param name="variablelist.as.blocks" select="1" />
<xsl:param name="paper.type" select="'A4'"/>

View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Tue Jul 8 15:46:51 CEST 2008 - bwalle@suse.de
- install dblatex files
-------------------------------------------------------------------
Fri Jul 4 16:11:15 CEST 2008 - bwalle@suse.de
- updated to version 8.2.7
* Added dvi, ps and tex output format options to a2x(1).
* Added —dblatex option to a2x(1) so dblatex(1) can be used to
generate PDFs.
* Added custom dblatex(1) configuration files (in distribution
./dblatex directory) which are used by a2x(1).
* dblatex(1) is now used to generate the distributed PDF version
of the AsciiDoc User Guide.
* If you don't need a customized the link caption you can enter
the http, https, ftp, file URLs and email addresses without
any special macro syntax.
* Highlighted source code paragraphs have been implemented.
* The source highlighter and music filter syntax has changed
* QuoteBlocks now have a verse style
* It is no up to the DocBook processor to highlight source code
syntax
* scaledwidth and align attributes have been added to the image
macro
* Added a2x(1) —fop-opts=FOP_OPTS option
* Added a2x(1) —dblatex-opts=DBLATEX_OPTS
* Added Mikhail Yakshin's FOP 0.95 patch
* The User Guide has been updated
* Fixed stylesheets/xhtml11-manpage.css not being included when
linkcss attribute was used
* Configuration file *-style attributes are now dumped correctly
* Fixed FAILED: malformed section entry LaTeX backend error
-------------------------------------------------------------------
Tue Jun 10 16:08:46 CEST 2008 - tiwai@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package asciidoc (Version 8.2.6)
# spec file for package asciidoc (Version 8.2.7)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -13,7 +13,7 @@
Name: asciidoc
Summary: Text-Based Document Generation
Version: 8.2.6
Version: 8.2.7
Release: 1
License: GPL v2 or later
Group: Development/Tools/Doc Generators
@ -22,10 +22,9 @@ Requires: docbook-xsl-stylesheets
AutoReqProv: on
Url: http://www.methods.co.nz/asciidoc/
Source0: %{name}-%{version}.tar.bz2
Patch: asciidoc-a2x-fop-fix.diff
Patch1: asciidoc-vim-fix.diff
Patch2: asciidoc-fop-extensions-fix.diff
Patch3: asciidoc-8.2.6-no-safe-check.diff
Patch0: asciidoc-vim-fix.diff
Patch1: asciidoc-8.2.6-no-safe-check.diff
Patch2: asciidoc-a2x-fop-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -59,7 +58,6 @@ Authors:
%patch
%patch1
%patch2 -p1
%patch3
%build
@ -73,7 +71,7 @@ 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 $RPM_BUILD_ROOT%{_bindir}/a2x
install -m 0644 doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
for i in images stylesheets javascripts docbook-xsl; do
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
done
@ -99,6 +97,35 @@ rm -rf $RPM_BUILD_ROOT
%doc doc examples
%changelog
* Tue Jul 08 2008 bwalle@suse.de
- install dblatex files
* Fri Jul 04 2008 bwalle@suse.de
- updated to version 8.2.7
* Added dvi, ps and tex output format options to a2x(1).
* Added —dblatex option to a2x(1) so dblatex(1) can be used to
generate PDFs.
* Added custom dblatex(1) configuration files (in distribution
./dblatex directory) which are used by a2x(1).
* dblatex(1) is now used to generate the distributed PDF version
of the AsciiDoc User Guide.
* If you don't need a customized the link caption you can enter
the http, https, ftp, file URLs and email addresses without
any special macro syntax.
* Highlighted source code paragraphs have been implemented.
* The source highlighter and music filter syntax has changed
* QuoteBlocks now have a verse style
* It is no up to the DocBook processor to highlight source code
syntax
* scaledwidth and align attributes have been added to the image
macro
* Added a2x(1) —fop-opts=FOP_OPTS option
* Added a2x(1) —dblatex-opts=DBLATEX_OPTS
* Added Mikhail Yakshin's FOP 0.95 patch
* The User Guide has been updated
* Fixed stylesheets/xhtml11-manpage.css not being included when
linkcss attribute was used
* Configuration file *-style attributes are now dumped correctly
* Fixed FAILED: malformed section entry LaTeX backend error
* Tue Jun 10 2008 tiwai@suse.de
- updated to version 8.2.6:
* Bug fixes since the last release plus a code cleanup and a