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

Update to 2.4.2

Browse Source
This commit is contained in:
Marc Maurer 2006-01-05 14:57:02 +00:00
parent ef3e0f2322
commit 2271228354
5 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
abiword-2.4.1.tar.bz2
abiword-2.4.2.tar.bz2

11
abiword-2.2.6-desktop.patch
View File

@ -1,11 +0,0 @@
--- abiword-2.2.6.orig/abi/abiword.desktop 2005-04-03 17:14:30.000000000 +0200
+++ abiword-2.2.6/abi/abiword.desktop 2005-04-04 02:09:01.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/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;
Name=Word Processor
Comment=AbiWord Word Processor
Name[de]=Textverarbeitung

24
abiword-2.4.2-macros.patch Normal file
View File

@ -0,0 +1,24 @@
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 2005-12-06 23:29:07.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 2006-01-05 15:10:52.000000000 +0100
@@ -31,7 +31,7 @@
LIBGSF_REQUIRED_VERSION=1.11.1
PKG_CHECK_MODULES(ABI_OPENDOCUMENT, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
- ABI_PLUGIN_REPORT([OpenDocument: okay]), \
+ ABI_PLUGIN_REPORT([OpenDocument: okay])
],[ ABI_PLUGIN_REPORT([OpenDocument: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
abi_plugin_disable=yes
])
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4 2005-12-31 13:18:08.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4 2006-01-05 15:11:03.000000000 +0100
@@ -31,7 +31,7 @@
LIBGSF_REQUIRED_VERSION=1.11.1
PKG_CHECK_MODULES(ABI_OPENWRITER, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
- ABI_PLUGIN_REPORT([OpenWriter: okay]), \
+ ABI_PLUGIN_REPORT([OpenWriter: okay])
],[ ABI_PLUGIN_REPORT([OpenWriter: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
abi_plugin_disable=yes
])

18
abiword.spec
View File

@ -2,8 +2,8 @@
Summary: The AbiWord word processor
Name: abiword
Version: 2.4.1
Release: 4%{?dist}
Version: 2.4.2
Release: 1%{?dist}
Epoch: 1
Group: Applications/Editors
License: GPL
@ -27,6 +27,9 @@ BuildRequires: libgnomeprint22-devel
BuildRequires: libgnomeprintui22-devel
# some plugin build deps
BuildRequires: readline-devel
BuildRequires: bzip2-devel
BuildRequires: poppler-devel >= 0.4.0
BuildRequires: ots-devel >= 0.4.2
BuildRequires: libwpd-devel >= 0.8.0
BuildRequires: librsvg2-devel
@ -43,7 +46,8 @@ BuildRequires: libgnomeui-devel
URL: http://www.abisource.com/
Patch0: abiword-2.0.9-windowshelppaths.patch
Patch1: abiword-2.2.6-desktop.patch
Patch1: abiword-2.4.2-desktop.patch
Patch2: abiword-2.4.2-macros.patch
%description
AbiWord is a cross-platform Open Source word processor. The goal is to make
@ -53,6 +57,7 @@ AbiWord full-featured, and remain lean.
%setup -q
%patch0 -p1 -b .windowshelppaths
%patch1 -p1 -b .desktop
%patch2 -p1 -b .macros
%build
cd abi
@ -136,6 +141,13 @@ update-desktop-database %{_datadir}/applications
%{_datadir}/icons/*png
%changelog
* Mon Jan 02 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.2-1.fc5
- Update to 2.4.2
- Add BuildRequires readline-devel for the AbiCommand plugin
- Add BuildRequires bzip2-devel and poppler-devel for plugins
- Update desktop patch
- Patch to fix plugin marcros
* Wed Nov 09 2005 Marc Maurer <uwog@abisource.com> - 1:2.4.1-4.fc5
- Fix bug 171928

2
sources
View File

@ -1 +1 @@
03d47aad66c4c9f9d329e3538de97dcd abiword-2.4.1.tar.bz2
935f1218eab7ff96b7a23cfeba4e76d1 abiword-2.4.2.tar.bz2