rpms/abiword/FC-3 abiword-2.4.1-gsf.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 abiword.spec, 1.21, 1.22 sources, 1.11, 1.12

[Marc Maurer (uwog)]

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16018

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.1-gsf.patch 
Log Message:
Update to 2.4.1



abiword-2.4.1-gsf.patch:

--- NEW FILE abiword-2.4.1-gsf.patch ---
diff -Nau --recursive abiword-2.4.1.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 abiword-2.4.1/abiword-plugins/wp/impexp/OpenDocument/plugin.m4
--- abiword-2.4.1.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2005-09-09 10:08:00.000000000 +0200
+++ abiword-2.4.1/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2005-10-11 21:50:49.000000000 +0200
@@ -28,7 +28,7 @@
 # Checks for libraries.
 # Checks for header files.
 
-LIBGSF_REQUIRED_VERSION=1.12.1
+LIBGSF_REQUIRED_VERSION=1.10.1
 
 PKG_CHECK_MODULES(ABI_OPENDOCUMENT, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
         ABI_PLUGIN_REPORT([OpenDocument: okay]), \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Oct 2005 21:12:25 -0000	1.11
+++ .cvsignore	13 Oct 2005 21:58:57 -0000	1.12
@@ -1 +1 @@
-abiword-2.4.0.tar.bz2
+abiword-2.4.1.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/abiword.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- abiword.spec	3 Oct 2005 21:12:25 -0000	1.21
+++ abiword.spec	13 Oct 2005 21:58:57 -0000	1.22
@@ -2,7 +2,7 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.0
+Version: 2.4.1
 Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
@@ -43,6 +43,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.2.6-desktop.patch
+Patch1: abiword-2.4.1-gsf.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -52,6 +53,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .gsf
 
 %build
 cd abi
@@ -130,7 +132,12 @@
 %{_datadir}/icons/*png
 
 %changelog
-* Mon Oct 3 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.0-1
+* Thu Oct 13 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.1-1.fc3
+- Update to 2.4.1
+- Require a slightly older version of gsf to compile the 
+  OpenDocument plugin
+
+* Mon Oct 3 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.0-1.fc3
 - Update to 2.4.0
 
 * Mon Nov  8 2004 Jeremy Katz <katzj at redhat.com> - 1:2.0.12-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Oct 2005 21:12:25 -0000	1.11
+++ sources	13 Oct 2005 21:58:57 -0000	1.12
@@ -1 +1 @@
-3822923f9793fd6f59c834dc462df84e  abiword-2.4.0.tar.bz2
+03d47aad66c4c9f9d329e3538de97dcd  abiword-2.4.1.tar.bz2