diff --git a/.cvsignore b/.cvsignore index 2f5379a..0b52d07 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abiword-2.4.4.tar.bz2 +abiword-2.4.5.tar.bz2 diff --git a/abiword-2.4.4-docbuild.patch b/abiword-2.4.4-docbuild.patch deleted file mode 100644 index 0379e97..0000000 --- a/abiword-2.4.4-docbuild.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 diff --git a/abiword.spec b/abiword.spec index 23496e5..e2df360 100644 --- a/abiword.spec +++ b/abiword.spec @@ -2,8 +2,8 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.4.4 -Release: 2%{?dist} +Version: 2.4.5 +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -20,6 +20,7 @@ BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: fribidi-devel, enchant-devel BuildRequires: libgnomeprint22-devel BuildRequires: libgnomeprintui22-devel +BuildRequires: autoconf, libtool # some plugin build deps BuildRequires: readline-devel @@ -43,7 +44,6 @@ 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 @@ -53,7 +53,6 @@ AbiWord full-featured, and remain lean. %setup -q %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop -%patch2 -p1 -b .docbuild %build cd abi @@ -135,6 +134,12 @@ update-desktop-database %{_datadir}/applications %{_datadir}/icons/*png %changelog +* Sun Jul 09 2006 Marc Maurer - 1:2.4.5-1.fc6 +- Update to 2.4.5 +- Fix bug 196690 - abiword fails to build in mock with minimal + build environment +- Drop the document build patch + * Tue Apr 13 2006 Marc Maurer - 1:2.4.4-2.fc6 - Fix documentation generation - Fix charting support diff --git a/sources b/sources index 188a1bb..aa0685d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69dd69179b861a41613291afd10af9ab abiword-2.4.4.tar.bz2 +e018669a154164d31c768f773a1c95b4 abiword-2.4.5.tar.bz2