rpms/openoffice.org/devel workspace.cmcfixes14.patch, NONE, 1.1 openoffice.org.spec, 1.380, 1.381 openoffice.org-1.9.80.NONE.skipuselessmodules.patch, 1.3, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Aug 10 11:43:32 UTC 2005 

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.cmcfixes14.patch 
Removed Files:
	openoffice.org-1.9.80.NONE.skipuselessmodules.patch 
Log Message:
recombine patch

workspace.cmcfixes14.patch:
 config/ssrc680.ini         |    0 
 config_office/configure.in |   30 ++++++++++++++++++++++++++++++
 postprocess/prj/build.lst  |    2 +-
 prj/build.lst              |    0 
 solenv/config/ssrc680.ini  |    2 +-
 wizards/prj/build.lst      |    2 +-
 6 files changed, 33 insertions(+), 3 deletions(-)

--- NEW FILE workspace.cmcfixes14.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.129
diff -u -p -r1.129 configure.in
--- openoffice.org.orig/config_office/configure.in	5 Aug 2005 15:05:56 -0000	1.129
+++ openoffice.org/config_office/configure.in	10 Aug 2005 10:53:53 -0000
@@ -57,6 +57,14 @@ AC_ARG_ENABLE(epm,
                           epm, however epm is useless for large scale
                           package building.
 ],,enable_epm="yes")
+AC_ARG_ENABLE(odk,
+[  --disable-odk           OO.o includes an ODK, office development kit
+                          which some packagers may with to build without
+],,enable_odk="yes")
+AC_ARG_ENABLE(qadevooo,
+[  --disable-qadevooo      OO.o includes some qa testsuites which some
+                          packagers may wish to build without
+],,enable_qadevooo="yes")
 AC_ARG_ENABLE(fontooo,
 [  --disable-fontooo       disable FontOOo
                           (useful for distributions using fontconfig for OOo)
@@ -2297,6 +2305,28 @@ else
    EPM=NO
 fi
 AC_SUBST(EPM)
+
+dnl ===================================================================
+dnl Check for building ODK
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build the ODK])
+if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
+   AC_MSG_RESULT([yes])
+   BUILD_TYPE="$BUILD_TYPE ODK"
+else
+   AC_MSG_RESULT([no])
+fi
+
+dnl ===================================================================
+dnl Check for building qadevOOo
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build qadevOOo])
+if test "z$enable_qadevooo" = "z" -o "$enable_qadevooo" != "no"; then
+   AC_MSG_RESULT([yes])
+   BUILD_TYPE="$BUILD_TYPE QADEVOOO"
+else
+   AC_MSG_RESULT([no])
+fi
 
 dnl ===================================================================
 dnl Check for system stdlibs
Index: prj/build.lst
===================================================================
RCS file: /cvs/installation/postprocess/prj/build.lst,v
retrieving revision 1.16
diff -u -p -r1.16 build.lst
--- openoffice.org.orig/postprocess/prj/build.lst	20 Jun 2005 07:29:14 -0000	1.16
+++ openoffice.org/postprocess/prj/build.lst	10 Aug 2005 11:10:22 -0000
@@ -1,4 +1,4 @@
-po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MathMLDTD msfontextract odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml unzip ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
+po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MathMLDTD msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml unzip ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
Index: config/ssrc680.ini
===================================================================
RCS file: /cvs/tools/solenv/config/ssrc680.ini,v
retrieving revision 1.74
diff -u -p -r1.74 ssrc680.ini
--- openoffice.org.orig/solenv/config/ssrc680.ini	15 Jul 2005 10:38:20 -0000	1.74
+++ openoffice.org/solenv/config/ssrc680.ini	10 Aug 2005 10:57:53 -0000
@@ -113,7 +113,7 @@ common
 			BIG_SVX TRUE
 			BIG_GOODIES TRUE
 			BMP_WRITES_FLAG TRUE
-            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM
+            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK QADEVOOO
 			RES_ENUS TRUE
 			RES_GER TRUE
 			NO_REC_RES TRUE
Index: prj/build.lst
===================================================================
RCS file: /cvs/installation/wizards/prj/build.lst,v
retrieving revision 1.38
diff -u -p -r1.38 build.lst
--- openoffice.org.orig/wizards/prj/build.lst	8 Jul 2005 12:34:30 -0000	1.38
+++ openoffice.org/wizards/prj/build.lst	10 Aug 2005 11:18:41 -0000
@@ -1,4 +1,4 @@
-wz      wizards     :   rsc javaunohelper jut unoil qadevOOo xalan transex3 NULL
+wz      wizards     :   rsc javaunohelper jut unoil QADEVOOO:qadevOOo xalan transex3 NULL
 wz      wizards\util                                            nmake           -       all     wz_util NULL
 wz      wizards\source\config                                   nmake           -       all     wz_config NULL
 wz      wizards\source\imagelists                               nmake           -       all     wz_imglists NULL


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- openoffice.org.spec	8 Aug 2005 16:50:24 -0000	1.380
+++ openoffice.org.spec	10 Aug 2005 11:43:28 -0000	1.381
@@ -1,5 +1,5 @@
 %define ooo2ver 123
-%define ooo_rpm_release 1
+%define ooo_rpm_release 2
 %define build_fc4 0
 %define build_fc5 1
 
@@ -115,7 +115,7 @@
 BuildRequires:	libgnomeprintui22-devel
 %endif
 
-Patch0:  openoffice.org-1.9.80.NONE.skipuselessmodules.patch
+Patch0:  workspace.cmcfixes14.patch
 Patch1:  openoffice.org-1.9.71s1.noregisterwizard.patch
 Patch2:  openoffice.org-1.9.74.ooo41875.mktemp.patch
 Patch3:  openoffice.org-1.9.84.ooo44843.sdcasting.patch
@@ -772,7 +772,7 @@
 
 %prep
 %setup -q -n SRC680_m%{ooo2ver}
-%patch0  -p1 -b .skipuselessmodules.patch
+%patch0  -p1 -b .workspace.cmcfixes14.patch
 %patch1  -p1 -b .noregisterwizard
 %patch2  -p1 -b .ooo41875.mktemp.patch
 %patch3  -p1 -b .ooo44843.sdcasting.patch
@@ -3092,6 +3092,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Aug 10 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.123-2
+- recombine into workspace.cmcfixes14.patch
+
 * Mon Aug 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.123-1
 - use system beanshell
 - drop integrated workspace.cmcfixes12


--- openoffice.org-1.9.80.NONE.skipuselessmodules.patch DELETED ---

More information about the fedora-cvs-commits mailing list