rpms
/
abiword
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix documentation generation, and enable charting support

This commit is contained in:
Marc Maurer 2006-04-13 10:55:15 +00:00
parent 0e0accaf59
commit c200b77160
3 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
abiword-2.4.2-desktop.patch
View File

@ -1,12 +0,0 @@
diff -r -u abiword-2.4.2.orig/abi/abiword.desktop abiword-2.4.2/abi/abiword.desktop
--- abiword-2.4.2.orig/abi/abiword.desktop 2005-11-09 11:21:03.000000000 +0100
+++ abiword-2.4.2/abi/abiword.desktop 2006-01-02 00:32:33.000000000 +0100
@@ -7,7 +7,7 @@
StartupNotify=true
Encoding=UTF-8
X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/vnd.ms-word;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
Name=AbiWord
GenericName=Word Processor
Comment=AbiWord Word Processor

45
abiword-2.4.4-docbuild.patch Normal file
View File

@ -0,0 +1,45 @@
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

9
abiword.spec
View File

@ -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: aiksaurus-gtk-devel >= 1.2.1
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 @@ URL: http://www.abisource.com/
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 @@ AbiWord full-featured, and remain lean.
%setup -q
%patch0 -p1 -b .windowshelppaths
%patch1 -p1 -b .desktop
%patch2 -p1 -b .docbuild
%build
cd abi
@ -132,6 +135,10 @@ update-desktop-database %{_datadir}/applications
%{_datadir}/icons/*png
%changelog
* Tue Apr 13 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.4-2.fc6
- Fix documentation generation
- Fix charting support
* Tue Apr 11 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.4-1.fc6
- New upstream version
- Remove the macro patch and update the desktop patch