rpms/abiword/FC-4 abiword-2.4.1-gsf.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 abiword.spec, 1.14, 1.15 sources, 1.8, 1.9

[Marc Maurer (uwog)]

Author: uwog

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

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.1-gsf.patch 
Log Message:
Update to 2.4.1, and fix the problem which caused the OpenDocument plugin
not to be available



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.11.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-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Oct 2005 20:32:20 -0000	1.8
+++ .cvsignore	11 Oct 2005 19:55:56 -0000	1.9
@@ -1 +1 @@
-abiword-2.4.0.tar.bz2
+abiword-2.4.1.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- abiword.spec	3 Oct 2005 20:32:20 -0000	1.14
+++ abiword.spec	11 Oct 2005 19:55:56 -0000	1.15
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.0
-Release: 2%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -43,6 +43,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.2.6-desktop.patch
+Patch2: 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,10 +132,15 @@
 %{_datadir}/icons/*png
 
 %changelog
-* Mon Oct 3 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.0-2
+* Tue Oct 11 2005 Marc Maurer <uwog at abisource.com> 1:2.4.1-1.fc4
+- Update to 2.4.1
+- Add patch to depend on libgsf 1.11.1 for the OpenDocument
+  exporter
+
+* Mon Oct 3 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.0-2.fc4
 - Rebuild
 
-* Mon Oct 3 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.0-1
+* Mon Oct 3 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.0-1.fc4
 - Require mathml-fonts
 - Update gtkmathview dependency to 0.7.5
 - Update to 2.4.0
@@ -151,7 +158,7 @@
 * Sun Jun 6 2005 Marc Maurer <uwog at abisource.com> - 1:2.2.8-1.fc4
 - Update to 2.2.8
 - Fix build with mailmerge patch
-- Use %{?dist} in the release name
+- Use %%{?dist} in the release name
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1:2.2.7-2
 - rebuild on all arches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Oct 2005 20:32:20 -0000	1.8
+++ sources	11 Oct 2005 19:55:56 -0000	1.9
@@ -1 +1 @@
-3822923f9793fd6f59c834dc462df84e  abiword-2.4.0.tar.bz2
+03d47aad66c4c9f9d329e3538de97dcd  abiword-2.4.1.tar.bz2