rpms/openoffice.org/devel openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, 1.8, 1.9 openoffice.org.spec, 1.1087, 1.1088 openoffice.org.2.0.3.gcc28409.anonymousexternc.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Mar 5 08:39:40 UTC 2007


Author: caolanm

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

Modified Files:
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 
	openoffice.org.spec 
Removed Files:
	openoffice.org.2.0.3.gcc28409.anonymousexternc.patch 
Log Message:
break testtools as well

openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch:
 bin/modules/installer/globals.pm             |    0 
 bin/modules/installer/servicesfile.pm        |    0 
 postprocess/prj/build.lst                    |    2 +-
 solenv/bin/modules/installer/globals.pm      |    2 +-
 solenv/bin/modules/installer/servicesfile.pm |    1 -
 5 files changed, 2 insertions(+), 3 deletions(-)

Index: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	28 Feb 2007 16:58:45 -0000	1.8
+++ openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	5 Mar 2007 08:39:37 -0000	1.9
@@ -29,3 +29,11 @@
  					}
  					else
  					{
+--- openoffice.org.orig/postprocess/prj/build.lst	2007-03-05 08:39:30.000000000 +0000
++++ openoffice.org/postprocess/prj/build.lst	2007-03-05 08:39:39.000000000 +0000
+@@ -1,4 +1,4 @@
+-po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd ODK:sdk_oo setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools NULL
++po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd ODK:sdk_oo setup_native slideshow starmath sw sysui testshl2 ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools NULL
+ po	postprocess			    	usr1	-	all	po_mkout NULL
+ po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
+ po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1087
retrieving revision 1.1088
diff -u -r1.1087 -r1.1088
--- openoffice.org.spec	4 Mar 2007 13:01:41 -0000	1.1087
+++ openoffice.org.spec	5 Mar 2007 08:39:37 -0000	1.1088
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 10
-%define rh_rpm_release 1.0
+%define rh_rpm_release 1
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -1070,7 +1070,7 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64 -fno-threadsafe-statics"
+export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64"
 #convert _smp_mflags to dmake equivalent
 SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=${SMP_MFLAGS/-j/-P}


--- openoffice.org.2.0.3.gcc28409.anonymousexternc.patch DELETED ---




More information about the fedora-cvs-commits mailing list