diff --git a/.cvsignore b/.cvsignore index 3393aaf..b11d493 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -abiword-2.7.10.tar.gz -abiword-docs-2.7.10.tar.gz +abiword-2.8.0.tar.gz +abiword-docs-2.8.0.tar.gz diff --git a/abiword.spec b/abiword.spec index 73c726a..28eb982 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,13 +1,13 @@ %define majorversion 2 -%define minorversion 7 -%define microversion 10 +%define minorversion 8 +%define microversion 0 %define olpc_build 0 Summary: The AbiWord word processor Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -57,7 +57,6 @@ BuildRequires: libwmf-devel BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel BuildRequires: link-grammar-devel >= 4.2.2 BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison -#BuildRequires: goffice04-devel BuildRequires: loudmouth-devel BuildRequires: asio-devel BuildRequires: libsoup-devel @@ -100,9 +99,9 @@ Includes and definitions for developing with libabiword. # build libabiword and abiword cd $RPM_BUILD_DIR/abiword-%{version} %if %{olpc_build} -%configure --disable-static --enable-dynamic --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar +%configure --disable-static --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar %else -%configure --disable-static --enable-dynamic --enable-plugins --enable-clipart --enable-templates +%configure --disable-static --enable-plugins --enable-clipart --enable-templates %endif %{__make} %{?_smp_mflags} @@ -178,6 +177,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Mon Oct 26 2009 Marc Maurer - 1:2.8.0-1 +- New upstream release + * Tue Sep 01 2009 Marc Maurer - 1:2.7.10-2 - Unconditionally add the dbus-glib-devel BR since the AbiCollab Sugar backend is now always compiled in, even on non-OLPC diff --git a/sources b/sources index 3040462..c68ef58 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d6d38074caaee3e92ac5e7fa0e357b51 abiword-2.7.10.tar.gz -4474020698070433e2f97fddbbdf7dd1 abiword-docs-2.7.10.tar.gz +f61c623cdb3c3b2aed05bbc868050ddd abiword-2.8.0.tar.gz +226c97dec63c2423dca9a431beb58e3a abiword-docs-2.8.0.tar.gz