rpms/openoffice.org/devel openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch, NONE, 1.1 openoffice.org.spec, 1.1522, 1.1523

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14624

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch 
Log Message:
add openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch

openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch:

--- NEW FILE openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch ---
Index: inc/tools/resmgr.hxx
===================================================================
RCS file: /cvs/util/tools/inc/tools/resmgr.hxx,v
retrieving revision 1.5
diff -u -r1.5 resmgr.hxx
--- openoffice.org.orig/tools/inc/tools/resmgr.hxx	11 Apr 2008 13:28:38 -0000	1.5
+++ openoffice.org/tools/inc/tools/resmgr.hxx	3 Jun 2008 15:26:03 -0000
@@ -38,7 +38,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 
 #define CREATEVERSIONRESMGR_NAME( Name )   #Name
-#define CREATEVERSIONRESMGR( Name ) 	   ResMgr::CreateResMgr( #Name )
+#define CREATEVERSIONRESMGR( Name ) 	   ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( Name ) )
 
 #define LOCALE_MAX_FALLBACK 6
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1522
retrieving revision 1.1523
diff -u -r1.1522 -r1.1523
--- openoffice.org.spec	3 Jun 2008 13:26:03 -0000	1.1522
+++ openoffice.org.spec	3 Jun 2008 15:28:35 -0000	1.1523
@@ -132,6 +132,7 @@
 Patch56: openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch
 Patch57: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
 Patch58: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
+Patch59: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1267,6 +1268,7 @@
 %patch56 -p1 -b .ooo90071.chart2.negativecount.patch
 %patch57 -p1 -b .oooXXXXX.odk.3layer.patch
 %patch58 -p1 -b .ooo90037.vcl.cairotransforms.patch
+%patch59 -p1 -b .ooo90178.tools.fixmacro.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3423,6 +3425,9 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
+* Tue Jun 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.15-2
+- add openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
+
 * Tue Jun 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.15-1
 - next version
 - add openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch for building against