rpms/openoffice.org/FC-3 patches-OOO_1_1-evoab2-crash.diff, NONE, 1.1 openoffice.org.spec, 1.63, 1.64

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv9366

Modified Files:
	openoffice.org.spec 
Added Files:
	patches-OOO_1_1-evoab2-crash.diff 
Log Message:
rh#147395# commit a fix

patches-OOO_1_1-evoab2-crash.diff:
 connectivity-source-drivers-evoab1-5-ndatabasemetadata-hxx.diff |    4 ----
 1 files changed, 4 deletions(-)

--- NEW FILE patches-OOO_1_1-evoab2-crash.diff ---
diff -ru ooo-build-cvs20050205/patches/evo2.orig/connectivity-source-drivers-evoab1-5-ndatabasemetadata-hxx.diff ooo-build-cvs20050205/patches/evo2/connectivity-source-drivers-evoab1-5-ndatabasemetadata-hxx.diff
--- ooo-build-cvs20050205/patches/evo2.orig/connectivity-source-drivers-evoab1-5-ndatabasemetadata-hxx.diff	2005-07-15 13:56:58.000000000 +0100
+++ ooo-build-cvs20050205/patches/evo2/connectivity-source-drivers-evoab1-5-ndatabasemetadata-hxx.diff	2005-07-15 13:57:27.000000000 +0100
@@ -84,10 +84,10 @@
 +		//**************************************************************
 +
 +		const GParamSpec *getField(guint n);
-+		guint             getFieldCount() G_GNUC_CONST;
-+		sal_Int32		 getFieldType(sal_Int32 nCol) G_GNUC_CONST;
-+		rtl::OUString	 getFieldTypeName(sal_Int32 nCol) G_GNUC_CONST;
-+		rtl::OUString     getFieldName(sal_Int32 nCol) G_GNUC_CONST;
++		guint             getFieldCount();
++		sal_Int32		 getFieldType(sal_Int32 nCol);
++		rtl::OUString	 getFieldTypeName(sal_Int32 nCol);
++		rtl::OUString     getFieldName(sal_Int32 nCol);
 +		
 +		class OEvoabDatabaseMetaData : public ODatabaseMetaDataBase
 +		{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-3/openoffice.org.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- openoffice.org.spec	12 Apr 2005 14:17:50 -0000	1.63
+++ openoffice.org.spec	15 Jul 2005 13:11:35 -0000	1.64
@@ -112,7 +112,7 @@
 Version:		1.1.3
 
 # SET RPM RELEASE # HERE!!!
-%define ooo_rpm_release	11
+%define ooo_rpm_release	12
 
 Release:		%{ooo_rpm_release}%{release_extension}%{java_release_tag}
 URL:			http://www.openoffice.org/
@@ -217,6 +217,8 @@
 # Fix CAN-2005-0941 (sot module overflow in .doc parsing)
 Patch24: patches-OOO_1_1-sot-overflow.diff
 
+# rh#147395# drop G_GNUC_CONST usage
+Patch25: patches-OOO_1_1-evoab2-crash.diff
 ##################################
 # Description
 ##################################
@@ -284,6 +286,7 @@
 %setup0 -q -n ooo-build-%{ooo_build_version}
 
 %patch0 -p1 -b .rh
+%patch25 -p1 -b .evoab2-crash.diff
 
 # Patch 3 is used in the install section
 
@@ -569,6 +572,10 @@
 # Changelog
 ##################################
 %changelog
+* Fri Jul 12 2005 Dan Williams <dcbw at redhat.com> - 1.1.3-12
+- add a fix for rh#147395#/ooo#52023# (caolanm)
+- UNBUILT
+
 * Tue Apr 12 2005 Dan Williams <dcbw at redhat.com> - 1.1.3-11
 - Fix CAN-2005-0941 (sot module overflow in .doc parsing)