rpms/abiword/devel abiword-2.4.2-macros.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 abiword.spec, 1.25, 1.26 sources, 1.12, 1.13 abiword-2.2.6-desktop.patch, 1.1, NONE

[Marc Maurer (uwog)]

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19276

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.2-macros.patch 
Removed Files:
	abiword-2.2.6-desktop.patch 
Log Message:
Update to 2.4.2



abiword-2.4.2-macros.patch:

--- NEW FILE abiword-2.4.2-macros.patch ---
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
 ])


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Oct 2005 22:56:47 -0000	1.12
+++ .cvsignore	5 Jan 2006 14:57:02 -0000	1.13
@@ -1 +1 @@
-abiword-2.4.1.tar.bz2
+abiword-2.4.2.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- abiword.spec	9 Nov 2005 10:28:53 -0000	1.25
+++ abiword.spec	5 Jan 2006 14:57:02 -0000	1.26
@@ -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: 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 @@
 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 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -136,6 +141,13 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Mon Jan 02 2006 Marc Maurer <uwog at 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 at abisource.com> - 1:2.4.1-4.fc5
 - Fix bug 171928
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	8 Oct 2005 22:56:47 -0000	1.12
+++ sources	5 Jan 2006 14:57:02 -0000	1.13
@@ -1 +1 @@
-03d47aad66c4c9f9d329e3538de97dcd  abiword-2.4.1.tar.bz2
+935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2


--- abiword-2.2.6-desktop.patch DELETED ---