OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/asciidoc?expand=0&rev=6

asciidoc-a2x-fop-fix.diff

@@ -0,0 +1,20 @@
+--- 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\""
+ }
+ 
+ function to_odt()

asciidoc.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 14 15:16:18 CET 2008 - tiwai@suse.de
+
+- add requirement to fop, fix the fop command name in a2x
+  (#353527)
+
 -------------------------------------------------------------------
 Tue Jan  8 13:04:06 CET 2008 - tiwai@suse.de
 

asciidoc.spec

@@ -13,13 +13,14 @@
 Name:           asciidoc
 Summary:        Text-Based Document Generation
 Version:        8.2.5
-Release:        1
+Release:        2
 License:        GPL v2 or later
 Group:          Development/Tools/Doc Generators
-Requires:       python >= 2.3
+Requires:       python >= 2.3, fop
 AutoReqProv:    on
 Url:            http://www.methods.co.nz/asciidoc/
 Source0:        %{name}-%{version}.tar.bz2
+Patch:          asciidoc-a2x-fop-fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -50,6 +51,7 @@ Authors:
 
 %prep
 %setup -q
+%patch
 
 %build
 
@@ -84,10 +86,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc examples
 
 %changelog
-* Tue Jan 08 2008 tiwai@suse.de
+* Mon Jan 14 2008 - tiwai@suse.de
+- add requirement to fop, fix the fop command name in a2x
+  (#353527)
+* Tue Jan 08 2008 - tiwai@suse.de
 - updated to version 8.2.5:
   * fixes couple of bugs in 8.2.4, no new features
-* Thu Nov 15 2007 tiwai@suse.de
+* Thu Nov 15 2007 - tiwai@suse.de
 - updated to version 8.2.2-8.2.4:
   * improvements on lang attribute handling
   * fixed spurious warning in Python 2.6
@@ -109,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
   {imagesdir} attribute to image link targets
 - split doc and examples to separate sub-package to make rpmlint
   happy
-* Tue May 22 2007 tiwai@suse.de
+* Tue May 22 2007 - tiwai@suse.de
 - updated to version 8.2.1:
   * VIM syntax highlighter
   * Labeled list definitions have been tightened
@@ -121,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
   * The Revision line now accommodates Subversion $Id markers
   * a2x(1) option —skip-asciidoc
   * Defaults to appropriate format if -format isn't given.
-* Mon Apr 02 2007 tiwai@suse.de
+* Mon Apr 02 2007 - tiwai@suse.de
 - updated to version 8.1.0:
   * AsciiDoc generated XHTML documents now display as table of
   contents if the toc attribute is defined.
@@ -135,23 +140,23 @@ rm -rf $RPM_BUILD_ROOT
   * Renamed {docdir} intrinsic attribute to unambiguous`{indir}
   * If asciidoc(1) outputs to stdout then instrinsic attribute
   {docname} is extracted from the input file name.
-* Thu Nov 23 2006 tiwai@suse.de
+* Thu Nov 23 2006 - tiwai@suse.de
 - Add missing a2x and other config files (#223299).
-* Thu Oct 12 2006 tiwai@suse.de
+* Thu Oct 12 2006 - tiwai@suse.de
 - updated to version 8.0.0:
   * An experimental LaTeX backend
   * Unconstrained quoting allows quoting to appear anywhere in inline text
   * a2x toolchain wrapper script can generate Open Document text files
   * More on CHANGELOG
-* Mon May 15 2006 tiwai@suse.de
+* Mon May 15 2006 - tiwai@suse.de
 - updated to version 7.1.2.
   * a2x toolchain wrapper
   * ASCIIMathML support
-* Wed Jan 25 2006 mls@suse.de
+* Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
-* Wed Jan 11 2006 tiwai@suse.de
+* Wed Jan 11 2006 - tiwai@suse.de
 - updated to version 7.0.4.
-* Fri Jul 01 2005 tiwai@suse.de
+* Fri Jul 01 2005 - tiwai@suse.de
 - fixed norootforbuild.
-* Fri Jun 24 2005 tiwai@suse.de
+* Fri Jun 24 2005 - tiwai@suse.de
 - initial version: 7.0.1.