rpms/openoffice.org/devel workspace.cmcfixes39.patch, NONE, 1.1 openoffice.org.spec, 1.1351, 1.1352

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.cmcfixes39.patch 
Log Message:
use system writer2latex

workspace.cmcfixes39.patch:

--- NEW FILE workspace.cmcfixes39.patch ---
Index: tools/config_office/configure.in
diff -u tools/config_office/configure.in:1.228 tools/config_office/configure.in:1.228.2.1
--- tools/config_office/configure.in:1.228	Tue Nov  6 06:53:15 2007
+++ tools/config_office/configure.in	Mon Nov 19 06:34:47 2007
@@ -260,6 +260,11 @@
                           distributions where the myspell dictionaries are
                           installed from other sources
 ],,)
+AC_ARG_WITH(writer2latex,
+[  --without-writer2latex Removes writer2latex from openoffice.org installation
+                          set, for people building for specific distributions
+                          where writer2latex is known to be already available
+],,)
 AC_ARG_WITH(nas,
 [  --without-nas           Build without nas support
 ],,)
@@ -5180,6 +5185,20 @@
 fi
 AC_SUBST(WITHOUT_AFMS)
 
+dnl ===================================================================
+dnl Test whether to include writer2latex
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include writer2latex])
+if test "$with_writer2latex" != "no" ; then
+  AC_MSG_RESULT([yes])
+  WITH_WRITER2LATEX=YES
+else
+  AC_MSG_RESULT([no])
+  WITH_WRITER2LATEX=NO
+  SCPDEFS="$SCPDEFS -DWITHOUT_WRITER2LATEX"
+fi
+AC_SUBST(WITH_WRITER2LATEX)
+
 AC_SUBST(SCPDEFS)
 
 AC_MSG_CHECKING([whether and how to use Xinerama])
Index: tools/config_office/set_soenv.in
diff -u tools/config_office/set_soenv.in:1.162 tools/config_office/set_soenv.in:1.162.4.1
--- tools/config_office/set_soenv.in:1.162	Wed Nov 14 08:45:56 2007
+++ tools/config_office/set_soenv.in	Mon Nov 19 06:34:48 2007
@@ -1875,6 +1875,7 @@
 ToFile( "MOZ_NSPR_CFLAGS",   "@MOZ_NSPR_CFLAGS@",  "e" );
 ToFile( "MOZ_NSS_CFLAGS",    "@MOZ_NSS_CFLAGS@",   "e" );
 ToFile( "MOZ_LDAP_CFLAGS",   "@MOZ_LDAP_CFLAGS@",  "e" );
+ToFile( "WITH_WRITER2LATEX", "@WITH_WRITER2LATEX@", "e" );
 ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
 ToFile( "WITHOUT_AFMS",      "@WITHOUT_AFMS@",     "e" );
 ToFile( "WITHOUT_PPDS",      "@WITHOUT_PPDS@",     "e" );
Index: xml/xmerge/source/writer2latex/makefile.mk
diff -u xml/xmerge/source/writer2latex/makefile.mk:1.3 xml/xmerge/source/writer2latex/makefile.mk:1.3.30.1
--- xml/xmerge/source/writer2latex/makefile.mk:1.3	Tue Aug  1 06:16:43 2006
+++ xml/xmerge/source/writer2latex/makefile.mk	Mon Nov 19 06:36:06 2007
@@ -37,5 +37,10 @@
 PRJ=../..
 PRJNAME=xmerge
 
+.IF "$(WITH_WRITER2LATEX)" == "NO"
+ at all:
+        @echo "building without writer2latex"
+.ENDIF
+
 .INCLUDE : ant.mk
 ALLTAR: ANTBUILD
Index: installation/scp2/source/writer/file_writer.scp
diff -u installation/scp2/source/writer/file_writer.scp:1.33 installation/scp2/source/writer/file_writer.scp:1.33.18.1
--- installation/scp2/source/writer/file_writer.scp:1.33	Thu Nov  1 10:58:31 2007
+++ installation/scp2/source/writer/file_writer.scp	Mon Nov 19 06:37:07 2007
@@ -57,14 +57,14 @@
 End
 
 #ifdef SOLAR_JAVA
-
+#ifndef WITHOUT_WRITER2LATEX
 File gid_File_Jar_Writer2latex
     TXT_FILE_BODY;
     Name = "writer2latex.jar";
     Dir = gid_Dir_Classes;
     Styles = (PACKED,PATCH);
 End
-
+#endif
 #endif
 
 #if defined UNX && ! defined MACOSX


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1351
retrieving revision 1.1352
diff -u -r1.1351 -r1.1352
--- openoffice.org.spec	30 Nov 2007 14:47:46 -0000	1.1351
+++ openoffice.org.spec	1 Dec 2007 20:29:56 -0000	1.1352
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 9
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -159,6 +159,7 @@
 Patch74: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
 Patch75: openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
 Patch76: openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch
+Patch77: workspace.cmcfixes39.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -226,7 +227,7 @@
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org2-writer
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: libwpd >= 0.8.0
+Requires: libwpd >= 0.8.0, openoffice.org-writer2latex
 
 %description writer
 The wordprocessor application of %{name}.
@@ -1115,6 +1116,7 @@
 %patch74 -p1 -b .ooo83878.unopkg.enablelinking.patch
 %patch75 -p1 -b .ooo83930.sw.flushanchors.patch
 %patch76 -p1 -b .ooo84001.slideshow.gccisaprick.patch
+%patch77 -p1 -b .workspace.cmcfixes39.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -1130,7 +1132,7 @@
 cd config_office
 autoconf
 export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=xulrunner --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --wit!
 hout-afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=xulrunner --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --wit!
 hout-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -2563,8 +2565,6 @@
 %{instdir}/program/libwpft680*.so
 %{instdir}/program/swriter
 %{instdir}/program/swriter.bin
-%dir %{instdir}/program/classes
-%{instdir}/program/classes/writer2latex.jar
 %dir %{instdir}/share
 %dir %{instdir}/share/registry
 %dir %{instdir}/share/registry/data
@@ -2837,6 +2837,9 @@
 
 
 %changelog
+* Sun Dev 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.6
+- add workspace.cmcfixes39.patch for ooo#83751 and use system writer2latex
+
 * Thu Nov 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.5
 - split out thesauri
 - move autocorrect files into langpacks and make appropiate aliases