New upstream version
This commit is contained in:
parent
5f0bde0345
commit
0e0accaf59
|
@ -1 +1 @@
|
||||||
abiword-2.4.2.tar.bz2
|
abiword-2.4.4.tar.bz2
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
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
|
|
||||||
])
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff -r -u abiword-2.4.4.orig/abi/abiword.desktop abiword-2.4.4/abi/abiword.desktop
|
||||||
|
--- abiword-2.4.4.orig/abi/abiword.desktop 2006-04-03 14:14:01.000000000 +0200
|
||||||
|
+++ abiword-2.4.4/abi/abiword.desktop 2006-04-11 00:12:19.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;
|
||||||
|
+MimeType=application/msword;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
|
14
abiword.spec
14
abiword.spec
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
Summary: The AbiWord word processor
|
Summary: The AbiWord word processor
|
||||||
Name: abiword
|
Name: abiword
|
||||||
Version: 2.4.2
|
Version: 2.4.4
|
||||||
Release: 8%{?dist}
|
Release: 1%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Group: Applications/Editors
|
Group: Applications/Editors
|
||||||
License: GPL
|
License: GPL
|
||||||
|
@ -30,7 +30,7 @@ BuildRequires: libwpd-devel >= 0.8.0
|
||||||
BuildRequires: librsvg2-devel
|
BuildRequires: librsvg2-devel
|
||||||
BuildRequires: libwmf-devel
|
BuildRequires: libwmf-devel
|
||||||
BuildRequires: aiksaurus-gtk-devel >= 1.2.1
|
BuildRequires: aiksaurus-gtk-devel >= 1.2.1
|
||||||
BuildRequires: link-grammar-devel >= 4.1.3
|
BuildRequires: link-grammar-devel >= 4.2.1
|
||||||
BuildRequires: gtkmathview-devel >= 0.7.5
|
BuildRequires: gtkmathview-devel >= 0.7.5
|
||||||
BuildRequires: libgsf-devel >= 1.12.1
|
BuildRequires: libgsf-devel >= 1.12.1
|
||||||
|
|
||||||
|
@ -41,8 +41,7 @@ BuildRequires: libgnomeui-devel
|
||||||
URL: http://www.abisource.com/
|
URL: http://www.abisource.com/
|
||||||
|
|
||||||
Patch0: abiword-2.0.9-windowshelppaths.patch
|
Patch0: abiword-2.0.9-windowshelppaths.patch
|
||||||
Patch1: abiword-2.4.2-desktop.patch
|
Patch1: abiword-2.4.4-desktop.patch
|
||||||
Patch2: abiword-2.4.2-macros.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
AbiWord is a cross-platform Open Source word processor. The goal is to make
|
AbiWord is a cross-platform Open Source word processor. The goal is to make
|
||||||
|
@ -52,7 +51,6 @@ AbiWord full-featured, and remain lean.
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .windowshelppaths
|
%patch0 -p1 -b .windowshelppaths
|
||||||
%patch1 -p1 -b .desktop
|
%patch1 -p1 -b .desktop
|
||||||
%patch2 -p1 -b .macros
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cd abi
|
cd abi
|
||||||
|
@ -134,6 +132,10 @@ update-desktop-database %{_datadir}/applications
|
||||||
%{_datadir}/icons/*png
|
%{_datadir}/icons/*png
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
||||||
|
|
||||||
* Wed Mar 29 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.2-8.fc6
|
* Wed Mar 29 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.2-8.fc6
|
||||||
- Rebuild
|
- Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue