diff --git a/.cvsignore b/.cvsignore index 641d25f..2f8e364 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -abiword-2.7.4.tar.gz -abiword-docs-2.7.4.tar.gz +abiword-2.7.5.tar.gz +abiword-docs-2.7.5.tar.gz diff --git a/abiword-2.6.4-desktop.patch b/abiword-2.6.4-desktop.patch deleted file mode 100644 index 2ba6245..0000000 --- a/abiword-2.6.4-desktop.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r abiword-2.6.4.orig/abiword.desktop abiword-2.6.4/abiword.desktop ---- abiword-2.6.4.orig/abiword.desktop 2008-07-13 15:11:02.000000000 +0200 -+++ abiword-2.6.4/abiword.desktop 2008-07-13 21:17:13.000000000 +0200 -@@ -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/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1; -+MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/x-abicollab;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/x-mif;application/x-kword;application/x-mswrite;application/x-applix-word;application/vnd.wordperfect; - Name=AbiWord - GenericName=Word Processor - Comment=Compose, edit, and view documents diff --git a/abiword-2.7.5-desktop.patch b/abiword-2.7.5-desktop.patch new file mode 100644 index 0000000..f1d24e2 --- /dev/null +++ b/abiword-2.7.5-desktop.patch @@ -0,0 +1,13 @@ +diff -u -r abiword-2.7.5.orig/abiword.desktop abiword-2.7.5/abiword.desktop +--- abiword-2.7.5.orig/abiword.desktop 2009-06-20 04:00:03.000000000 +0200 ++++ abiword-2.7.5/abiword.desktop 2009-06-21 15:18:00.000000000 +0200 +@@ -6,7 +6,7 @@ + Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base; + StartupNotify=true + X-Desktop-File-Install-Version=0.9 +-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1; ++MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/x-applix-word;application/x-mswrite;application/x-kword;application/x-mif;application/vnd.wordperfect;application/x-abicollab; + Name=AbiWord + GenericName=Word Processor + Comment=Compose, edit, and view documents +Only in abiword-2.7.5: abiword.desktop~ diff --git a/abiword.spec b/abiword.spec index 51f9afd..7a83688 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,13 +1,13 @@ %define majorversion 2 %define minorversion 7 -%define microversion 4 +%define microversion 5 %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+ @@ -27,7 +27,7 @@ while still remaining lean. Summary: Library for developing applications based on AbiWord's core Group: System Environment/Libraries Patch0: abiword-2.6.0-windowshelppaths.patch -Patch1: abiword-2.6.4-desktop.patch +Patch1: abiword-2.7.5-desktop.patch Patch2: abiword-2.6.0-boolean.patch Patch3: abiword-plugins-2.6.0-boolean.patch %if %{olpc_build} @@ -180,6 +180,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Fri Jun 19 2009 Marc Maurer - 1:2.7.5-1 +- New upstream release + * Fri Jun 19 2009 Marc Maurer - 1:2.7.4-2 - Add libsoup-devel BR - Remove version from asio-devel BR diff --git a/sources b/sources index fbe5ee8..0e469a1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -83210c96f3cb30d1c787c6cf65a2f1ac abiword-2.7.4.tar.gz -150e2e8bdfeffe62ff2783275767f11e abiword-docs-2.7.4.tar.gz +07df602ba17a8b8d3a1fd60a8fa3a6aa abiword-2.7.5.tar.gz +397ffc818f647a8f4ec351a28905c6a8 abiword-docs-2.7.5.tar.gz