rpms/abiword/devel abiword-2.4.4-docbuild.patch, NONE, 1.1 abiword.spec, 1.34, 1.35 abiword-2.4.2-desktop.patch, 1.1, NONE
Marc Maurer (uwog)
fedora-extras-commits at redhat.com
Thu Apr 13 10:55:15 UTC 2006
Author: uwog
Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29610
Modified Files:
abiword.spec
Added Files:
abiword-2.4.4-docbuild.patch
Removed Files:
abiword-2.4.2-desktop.patch
Log Message:
Fix documentation generation, and enable charting support
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/devel/abiword.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- abiword.spec 11 Apr 2006 07:56:19 -0000 1.34
+++ abiword.spec 13 Apr 2006 10:55:15 -0000 1.35
@@ -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
@@ -33,6 +33,7 @@
BuildRequires: link-grammar-devel >= 4.2.1
BuildRequires: gtkmathview-devel >= 0.7.5
BuildRequires: libgsf-devel >= 1.12.1
+BuildRequires: goffice-devel >= 0.1.0
# gnome build deps
BuildRequires: libbonobo-devel
@@ -42,6 +43,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 +53,7 @@
%setup -q
%patch0 -p1 -b .windowshelppaths
%patch1 -p1 -b .desktop
+%patch2 -p1 -b .docbuild
%build
cd abi
@@ -132,6 +135,10 @@
%{_datadir}/icons/*png
%changelog
+* Tue Apr 13 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-2.fc6
+- Fix documentation generation
+- Fix charting support
+
* Tue Apr 11 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc6
- New upstream version
- Remove the macro patch and update the desktop patch
--- abiword-2.4.2-desktop.patch DELETED ---
More information about the scm-commits
mailing list