rpms/openoffice.org/FC-4 openoffice.org.spec,1.205,1.206

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
make email mailmerge fc5 only


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- openoffice.org.spec	14 Jul 2005 08:10:29 -0000	1.205
+++ openoffice.org.spec	17 Jul 2005 11:36:35 -0000	1.206
@@ -1,34 +1,70 @@
 %define ooo2ver 117
-%define ooo_rpm_release 1
+%define ooo_rpm_release 2
 %define build_fc4 1
 %define build_fc5 0
 
-#undef to get english only and no-langpacks for a quick smoketest build
+# gcc#19664#
+%define stlvisibilityfcked 1
+# rh#156039#
+%define includeexternals 1
+# define to compile with gcc3 and gcj4 mixture
+%define usegcc3 0
+# undef to get english only and no-langpacks for a quick smoketest build
 %define langpacks 1
-%if %{langpacks}
-%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sv ta-IN th tr zh-CN zh-TW zu
+
+%if %{build_fc4}
+%define release_extension .1.0.fc4
+%define internalxmlsec 1
+%define internaldb 1
+%define includeemailmerge 0
+%endif
+%if %{build_fc5}
+%define release_extension .2.0.fc5
+%define internalxmlsec 0
+%define internaldb 1
+%define includeemailmerge 1
+%endif
+
+%if %{usegcc3}
+%define gij gij4
+%define libgcj libgcj4
+%define libgcjdevel libgcj4-devel
+%define gccjava gcc4-java
 %else
-%define langpack_langs en-US
+%define gij gij
+%define libgcj libgcj
+%define libgcjdevel libgcj-devel
+%define gccjava gcc-java
 %endif
 
-#undef to try and compile with gcc3 and gcj4
-%define gcc_is_gcc4 1
+%if %{internalxmlsec}
+%define xmlsecflags --without-system-xmlsec
+%else
+%define xmlsecflags --with-system-xmlsec
+%endif
+%if %{internaldb}
+%define dbflags --without-system-db
+%else
+%define dbflags --with-system-db
+%endif
+%if %{stlvisibilityfcked}
+%define stlflags --with-stlport4
+%else
+%define stlflags --without-stlport4
+%endif
 
-%define gccver 3.4.3
-%define gcjver 4.0.0
+%define extraflags %{xmlsecflags} %{dbflags} %{stlflags}
 
+%if %{includeexternals}
 # Disable internal dependency generator while we include libxmlsec1 and
 # other similiar duplicate/conflicting libs rh#156039#
 %define _use_internal_dependency_generator 0
-
-%if %{build_fc4}
-%define release_extension .1.0.fc4
-%define extraflags = --without-system-xmlsec
 %endif
-%if %{build_fc5}
-%define release_extension .2.0.fc5
-#%define extraflags = --with-system-xmlsec --without-stlport4
-%define extraflags = --with-system-xmlsec
+
+%if %{langpacks}
+%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sv ta-IN th tr zh-CN zh-TW zu
+%else
+%define langpack_langs en-US
 %endif
 
 ExclusiveArch:  %{ix86} ppc
@@ -46,23 +82,19 @@
 Source2:	openoffice.org-myspell-contrib.tar.gz
 Source3:	GSI_ta-IN.sdf
 Source4:	openoffice.org-simple-crash_report.sh
-BuildRequires: 	perl, sed, zip, bzip2, unzip, tar, findutils
+BuildRequires: 	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils
 BuildRequires: 	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
-BuildRequires: 	gcc >= %{gccver}, gcc-c++ >= %{gccver}, binutils
-%if %{gcc_is_gcc4}
-BuildRequires:  gcc-java >= %{gcjver}, libgcj-devel >= %{gcjver}
-%else
-BuildRequires:  gcc4-java >= %{gcjver}, libgcj4-devel >= %{gcjver}
-%endif
+BuildRequires: 	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils
+BuildRequires:  %{gccjava} >= 4.0.0, %{libgcjdevel} >= 4.0.0
 BuildRequires: 	java-1.4.2-gcj-compat-devel
 BuildRequires: 	libart_lgpl-devel >= 2.3.11, zlib-devel, freetype-devel, 
 BuildRequires: 	gtk2-devel >= 2.4.8, gnome-vfs2-devel, cups-devel, curl-devel
 BuildRequires: 	boost-devel >= 1.31.0, python-devel, mozilla-devel >= 1.7.5
 BuildRequires: 	expat-devel, libxml2-devel, openldap-devel, neon-devel >= 0.24 
 BuildRequires: 	libidn-devel, startup-notification-devel, libwpd-devel >= 0.8.0
-BuildRequires:	desktop-file-utils >= 0.9, libjpeg-devel, pam-devel, tcsh
+BuildRequires:	desktop-file-utils >= 0.9, libjpeg-devel, pam-devel
 BuildRequires:	perl-Archive-Zip, evolution-data-server-devel, libxslt >= 1.1.14
-%if %{build_fc5}
+%if ! %{internalxmlsec}
 BuildRequires:	xmlsec1-nss-devel >= 1.2.8-2
 %endif
 
@@ -106,17 +138,17 @@
 Patch37: workspace.fpicandrpath.patch
 Patch38: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
 Patch39: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
-Patch40: openoffice.org-1.9.110.oooXXXXX.psprintfriend.patch
+Patch40: workspace.mh19104.patch
 Patch41: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
 Patch42: openoffice.org-1.9.112.ooo51724.testtools.patch
 Patch43: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
-Patch44: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
+Patch44: workspace.cmcfixes11.patch
 Patch45: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
 Patch46: openoffice.org-1.9.114.ooo51718.rpath.patch
 Patch47: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
 Patch48: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
 Patch49: openoffice.org-1.9.114.ooo51638.mailmerge.patch
-#Patch50: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
+Patch50: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
 Patch51: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
 Patch52: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
 Patch53: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
@@ -126,21 +158,15 @@
 Patch57: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
 Patch58: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
 Patch59: workspace.impress63.patch
-Patch60: openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch
-Patch61: openoffice.org-1.9.114.oooXXXXX.systemboost.patch
-Patch62: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
-Patch63: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
+Patch60: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+Patch61: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
+Patch62: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
+Patch63: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
 %define withlang --with-lang="%{langpack_langs}"
 
-%if %{gcc_is_gcc4}
-%define java_interpreter gij
-%else
-%define java_interpreter gij4
-%endif
-
 %description
 OpenOffice.org is an Open Source, community-developed, multi-platform
 office productivity suite.  It includes the key desktop applications,
@@ -169,11 +195,7 @@
 # We need at least 32-bit redhat-artwork and 32-bit gtk2-engines, but
 # rpm doesn't "do the right thing" if only the packages are Required.
 Requires: libbluecurve.so, libcrux-engine.so
-%if %{gcc_is_gcc4}
-Requires: libgcj >= %{gcjver}
-%else
-Requires: libgcj4 >= %{gcjver}
-%endif
+Requires: %{libgcj} >= 4.0.0
 PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.4.8
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org-libs
@@ -203,12 +225,23 @@
 Group: Applications/Productivity
 Obsoletes: openoffice.org
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
 Requires: libwpd >= 0.8.0
 
 %description writer
 wordprocessor application of %{name}
 
+%if %{includeemailmerge}
+%package emailmerge
+Summary: email mail merge component for %{name}
+Group: Applications/Productivity
+Obsoletes: openoffice.org
+Requires: %{name}-writer = %{epoch}:%{version}-%{release}
+Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
+
+%description emailmerge
+enables %{name} writer module to enable mail merge to email
+%endif
+
 %package calc
 Summary: calc module for %{name}
 Obsoletes: openoffice.org
@@ -749,17 +782,19 @@
 %patch37 -p1 -b .workspace.fpicandrpath.patch
 %patch38 -p1 -b .NONE.gcc3gcj4.patch
 %patch39 -p1 -b .ooo9290.goodies.epstoepdf.patch
-%patch40 -p1 -b .oooXXXXX.psprintfriend.patch
+%patch40 -p1 -b .workspace.mh19104.patch
 %patch41 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
 %patch42 -p1 -b .ooo51724.testtools.patch
 %patch43 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
-%patch44 -p1 -b .ooo43430.cvskk.np_sdk.patch
+%patch44 -p1 -b .workspace.cmcfixes11.patch
 %patch45 -p1 -b .ooo51385.bridges.stack.patch
 %patch46 -p1 -b .ooo51718.rpath.patch
 %patch47 -p1 -b .rh161886.rpath.desktop.patch
 %patch48 -p1 -b .ooo51637.solenv.pyuno.patch
+%if %{includeemailmerge}
 %patch49 -p1 -b .ooo51638.mailmerge.patch
-#%patch50 -p1 -b .oooXXXXX.nostlport.patch
+%endif
+%patch50 -p1 -b .oooXXXXX.nostlport.patch
 %patch51 -p1 -b .ooo51673.printing.checkerror.patch
 %patch52 -p1 -b .ooo51735.audio.withoutnas.patch
 %patch53 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
@@ -767,14 +802,14 @@
 %patch55 -p1 -b .ooo51745.cpputools.patch
 %patch56 -p1 -b .ooo51755.scp2.parallel.patch
 %patch57 -p1 -b .ooo51774.rsc.parallel.patch
-%if %{build_fc5}
 %patch58 -p1 -b .oooXXXXX.extensions.evolution.patch
-%endif
 %patch59 -p1 -b .workspace.impress63.patch
-%patch60 -p1 -b .rh162935.gccXXXXX.weirdcrash.patch
-%patch61 -p1 -b .oooXXXXX.systemboost.patch
-%patch62 -p1 -b .rh163147.thorndale.fontconfig.patch
-%patch63 -p1 -b .ooo51912.nullpointer.wizards.patch
+%patch60 -p1 -b .rh163147.thorndale.fontconfig.patch
+%patch61 -p1 -b .ooo51912.nullpointer.wizards.patch
+%patch62 -p1 -b .ooo52023.evoadb2.nognuconst.patch
+%patch63 -p1 -b .ooo52048.inhalt.sw.patch
+
+%if %{includeexternals}
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/db4 then this needs to be modified/dropped
@@ -792,6 +827,7 @@
 chmod +x find-requires
 %define __find_requires %{_builddir}/SRC680_m%{ooo2ver}/find-requires
 #end ludicrous workaround
+%endif
 
 tar xzf %{SOURCE2}
 %build
@@ -807,7 +843,7 @@
 fi
 cd config_office
 autoconf
-%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --enable-xsltproc --disable-fontooo --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas %{extraflags} %{withlang}
+%configure --with-java=%{gij} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --enable-xsltproc --disable-fontooo --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas %{extraflags} %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -836,7 +872,7 @@
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
 
-%if !%{gcc_is_gcc4}
+%if %{usegcc3}
 #this is needed for a mix of gcc/g++ 3.4.x and gcj/gij 4.0.x
 export GCJ_CFLAGS="-I`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`""include"
 export GCJ_LDFLAGS="-L`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`"
@@ -2182,11 +2218,12 @@
 %{instdir}/program/libxcr680*.so
 %{instdir}/program/libxmlfa680*.so
 %{instdir}/program/libxmlfd680*.so
-%if %{build_fc4}
+%if %{internalxmlsec}
 %{instdir}/program/libxmlsec*
-%{instdir}/program/libstlport*.so
 %else
 %{instdir}/program/libxmlsecurity.so
+%endif
+%if %{stlvisibilityfcked}
 %{instdir}/program/libstlport*.so
 %endif
 %{instdir}/program/libxmx680*.so
@@ -2681,6 +2718,22 @@
 %postun draw
 update-desktop-database -q %{_datadir}/applications
 
+%if %{includeemailmerge}
+%files emailmerge
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/program
+%{instdir}/program/mailmerge.py*
+%dir %{instdir}/share
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
+%endif
+
 %files writer
 %defattr(-,root,root)
 %dir %{instdir}
@@ -2718,7 +2771,6 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ko.xcu
 %{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-CN.xcu
 %{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-TW.xcu
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
 %dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
 %dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
 %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_global_filters.xcu
@@ -2938,7 +2990,6 @@
 %dir %{instdir}
 %dir %{instdir}/program
 %{instdir}/program/libpyuno.so
-%{instdir}/program/mailmerge.py*
 %{instdir}/program/pythonloader.py*
 %{instdir}/program/pythonloader.uno.so
 %{instdir}/program/pythonloader.unorc
@@ -2958,6 +3009,14 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Jul 15 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.117-2
+- add openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch to
+  fix evoab2
+- add openoffice.org-1.9.117.ooo52048.inhalt.sw.patch as minor .doc
+  export regression fix for rh#158252#
+- split email mailmerge stuff into a subpackage to avoid python
+  dependancy on writer
+
 * Wed Jul 13 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.117-1
 - bump to next version and drop the integrated (finally) fpicker patch
 - back to using stlport for now because I'm dubious