rpms/abiword/FC-4 abiword-2.4.4-docbuild.patch, NONE, 1.1 abiword.spec, 1.22, 1.23

[Marc Maurer (uwog)]

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32609

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.4-docbuild.patch 
Log Message:
Fix documentation generation



abiword-2.4.4-docbuild.patch:

--- NEW FILE abiword-2.4.4-docbuild.patch ---
diff -r -u abiword-2.4.4.orig/abiword-docs/make-dbk.sh abiword-2.4.4/abiword-docs/make-dbk.sh
--- abiword-2.4.4.orig/abiword-docs/make-dbk.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-dbk.sh	2006-04-12 23:20:18.000000000 +0200
@@ -33,7 +33,7 @@
 		      echo $i
 
 		      # save to docbook, rename to .xml
-		      AbiWord-2.0 --to=dbk $i 2>/dev/null
+		      AbiWord-2.4 --to=dbk $i 2>/dev/null
 		      mv $n.dbk $n.xml
 		done
 
diff -r -u abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh abiword-2.4.4/abiword-docs/make-gnome-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-gnome-html.sh	2006-04-12 23:20:18.000000000 +0200
@@ -31,7 +31,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      AbiWord-2.0 --to=html $i 2>/dev/null
+		      AbiWord-2.4 --to=html $i 2>/dev/null
 		done
 
 		cd $CVS
diff -r -u abiword-2.4.4.orig/abiword-docs/make-html.sh abiword-2.4.4/abiword-docs/make-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-html.sh	2006-04-12 23:20:44.000000000 +0200
@@ -30,7 +30,7 @@
 fi
 
 if [ -z "$ABI_DOC_PROG" ]; then
-ABI_DOC_PROG="AbiWord-2.2";
+ABI_DOC_PROG="AbiWord-2.4";
 fi
 
 html_export_options="html4: no; use-awml: no; embed-css: yes; embed-images:yes"
@@ -45,7 +45,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      $ABI_DOC_PROG --to=html --exp-props=$html_export_options $i 2>/dev/null
+		      $ABI_DOC_PROG --to=html --exp-props="$html_export_options" $i 2>/dev/null
 		      $CVS/make-abidoc.pl -I $n.info -S header.xhtml -F footer.xhtml > $n.xhtml
 		      cp $n.xhtml $n.html
 			rm -f $n.xhtml


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- abiword.spec	11 Apr 2006 10:01:59 -0000	1.22
+++ abiword.spec	13 Apr 2006 11:57:11 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -42,6 +42,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
+Patch2: abiword-2.4.4-docbuild.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -51,6 +52,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .docbuild
 
 %build
 cd abi
@@ -134,6 +136,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Tue Apr 13 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-2.fc4
+- Fix documentation generation
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc4
 - New upstream version
 - Remove the macro patch and update the desktop patch