rpms/abiword/devel abiword-2.4.5-fontconfig.patch, NONE, 1.1 abiword.spec, 1.38, 1.39

[Marc Maurer (uwog)]

Author: uwog

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

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.5-fontconfig.patch 
Log Message:
Fix 207294: abiword crashes at exit



abiword-2.4.5-fontconfig.patch:

--- NEW FILE abiword-2.4.5-fontconfig.patch ---
diff -r -u abiword-2.4.5.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.4.5/abi/src/af/xap/unix/xap_UnixApp.cpp
--- abiword-2.4.5.orig/abi/src/af/xap/unix/xap_UnixApp.cpp	2006-05-12 22:40:11.000000000 +0200
+++ abiword-2.4.5/abi/src/af/xap/unix/xap_UnixApp.cpp	2006-10-12 15:12:34.000000000 +0200
@@ -134,10 +134,6 @@
 	DELETEP(m_pUnixToolbarIcons);
 	
 	delete m_fontManager;
-
-#if FC_MINOR > 2
-	FcFini();
-#endif
 }
 
 bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue)


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- abiword.spec	11 Sep 2006 17:38:58 -0000	1.38
+++ abiword.spec	12 Oct 2006 14:55:56 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -45,6 +45,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
+Patch2: abiword-2.4.5-fontconfig.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -54,6 +55,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .fontconfig
 
 %build
 cd abi
@@ -135,6 +137,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Thu Oct 12 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.5-4.fc6
+- Fix bug 207294
+
 * Mon Sep 11 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.5-3.fc6
 - Rebuild for FC6