[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org.spec, 1.304, 1.305 openoffice.org-1.9.116.rh162935.gcc22482.weirdcrash.patch, 1.1, NONE



Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-1.9.116.rh162935.gcc22482.weirdcrash.patch 
Log Message:
rearrange spec


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- openoffice.org.spec	14 Jul 2005 16:00:37 -0000	1.304
+++ openoffice.org.spec	14 Jul 2005 18:13:26 -0000	1.305
@@ -3,32 +3,55 @@
 %define build_fc4 0
 %define build_fc5 1
 
-#undef to get english only and no-langpacks for a quick smoketest build
+# 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
 %else
 %define langpack_langs en-US
 %endif
-
-#undef to try and compile with gcc3 and gcj4
+# gcc#19664#
+%define stlvisibilityfcked 1
+# rh#156039#
+%define includeexternals 1
+# undef to compile with gcc3 and gcj4 mixture
 %define gcc_is_gcc4 1
 
-%define gccver 3.4.3
-%define gcjver 4.0.0
-
-# 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
+%define internalxmlsec 1
 %endif
 %if %{build_fc5}
 %define release_extension .2.0.fc5
-#%define extraflags = --with-system-xmlsec --without-stlport4
-%define extraflags = --with-system-xmlsec
+%define internalxmlsec 0
+%endif
+
+%if %{gcc_is_gcc4}
+%define gij gij
+%define libgcj libgcj
+%define gcc-java gcc-java
+%else
+%define gij gij4
+%define libgcj libgcj4
+%define gcc-java gcc4-java
+%endif
+
+%if %{internalxmlsec}
+%define xmlsecflags --without-system-xmlsec
+else
+%define xmlsecflags --with-system-xmlsec
+%endif
+
+%if %{stlvisibilityfcked}
+%define extraflags %{xmlsecflags}
+%else
+%define extraflags %{xmlsecflags} --without-stlport4
+%endif
+
+%if %{includeexternals}
+# Disable internal dependency generator while we include libxmlsec1 and
+# other similiar duplicate/conflicting libs rh#156039#
+%define _use_internal_dependency_generator 0
 %endif
 
 ExclusiveArch:  %{ix86} ppc
@@ -48,12 +71,8 @@
 Source4:	openoffice.org-simple-crash_report.sh
 BuildRequires: 	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:  %{gcc-java} >= 4.0.0, libgcj-devel >= 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
@@ -62,7 +81,7 @@
 BuildRequires: 	libidn-devel, startup-notification-devel, libwpd-devel >= 0.8.0
 BuildRequires:	desktop-file-utils >= 0.9, libjpeg-devel, pam-devel, tcsh
 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
 
@@ -116,7 +135,7 @@
 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 +145,14 @@
 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.gcc22482.weirdcrash.patch
-Patch61: openoffice.org-1.9.114.ooo51978.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.114.ooo51978.systemboost.patch
+Patch61: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+Patch62: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.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 +181,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
@@ -759,7 +767,7 @@
 %patch47 -p1 -b .rh161886.rpath.desktop.patch
 %patch48 -p1 -b .ooo51637.solenv.pyuno.patch
 %patch49 -p1 -b .ooo51638.mailmerge.patch
-#%patch50 -p1 -b .oooXXXXX.nostlport.patch
+%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
@@ -771,10 +779,11 @@
 %patch58 -p1 -b .oooXXXXX.extensions.evolution.patch
 %endif
 %patch59 -p1 -b .workspace.impress63.patch
-%patch60 -p1 -b .gcc22482.weirdcrash.patch
-%patch61 -p1 -b .ooo51978.systemboost.patch
-%patch62 -p1 -b .rh163147.thorndale.fontconfig.patch
-%patch63 -p1 -b .ooo51912.nullpointer.wizards.patch
+%patch60 -p1 -b .ooo51978.systemboost.patch
+%patch61 -p1 -b .rh163147.thorndale.fontconfig.patch
+%patch62 -p1 -b .ooo51912.nullpointer.wizards.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 +801,7 @@
 chmod +x find-requires
 %define __find_requires %{_builddir}/SRC680_m%{ooo2ver}/find-requires
 #end ludicrous workaround
+%endif
 
 tar xzf %{SOURCE2}
 %build
@@ -807,7 +817,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 +846,7 @@
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
 
-%if !%{gcc_is_gcc4}
+%if ! %{gcc_is_gcc4}
 #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 +2192,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


--- openoffice.org-1.9.116.rh162935.gcc22482.weirdcrash.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]