Hello community, here is the log from the commit of package OpenOffice_org checked in at Fri Oct 13 20:03:12 CEST 2006. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2006-09-29 13:54:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org.changes 2006-10-13 09:02:43.000000000 +0200 @@ -1,0 +2,34 @@ +Thu Oct 12 20:59:15 CEST 2006 - pmladek@suse.cz + +- updated to 2.0.4 (final) +- updated ooo-build to version 2.0.4: + * target OOO_2_0_4 + * allow to build older bytecode with newer JDK + * save more space/time/code + * temporary disabled some dangerous speedup fixes + * lots VBA fixes and improvements + * lots 64bit fixes + * input field dialog improvement + * unopkg fails when Setup.xcu is missing + * optional argument issues + * use fontconfig for font fallback + * mozilla certificates detection + * some i18n support added + * build with Xalan >= 2.7.x fix + * bashism fixes + * prebuilt mono dlls update + * wazard crash +- updated extra translation sources: Danish, Greek, Welsh +- forced source="1.4" and target="1.4" for build with Sun java +- removed java-1_4_2-sun-devel from BuildRequires and added back the default + java2-devel-packages +- synced features between x86_64 and ix86 build; synced BuildRequires + accordingly +- enabled gstreamer also when build on SLED10 +- updated the prebuilt cli*.dll [n#209342] +- added postinstall script to put the dlls into GAC +- disabled insufficient fix for the wizard crash +- added hack to start makefile several times to try to finish build even with + the strange random build crash in officecfg + +------------------------------------------------------------------- Old: ---- minmem ood680-m4-binfilter.tar.bz2 ood680-m4-core.tar.bz2 ood680-m4-lang.tar.bz2 ood680-m4-sdk_oo.tar.bz2 ood680-m4-system.tar.bz2 ooo-build-ood680-m4-xalan-serializer-jar.diff ooo-build-ood680-m4.tar.gz New: ---- OOO_2_0_4-binfilter.tar.bz2 OOO_2_0_4-core.tar.bz2 OOO_2_0_4-lang.tar.bz2 OOO_2_0_4-sdk_oo.tar.bz2 OOO_2_0_4-system.tar.bz2 ooo-build-2.0.4-disable-broken-wizard-crash-fix.diff ooo-build-2.0.4.tar.gz ooo-build-ood680-m4f-distro-config-clean-up.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.xG7zrh/_old 2006-10-13 20:01:07.000000000 +0200 +++ /var/tmp/diff_new_pack.xG7zrh/_new 2006-10-13 20:01:07.000000000 +0200 @@ -13,32 +13,23 @@ Name: OpenOffice_org BuildRequires: ImageMagick ant boost-devel ccache cups-devel curl-devel db-devel db-java flac-devel gnome-vfs2-devel gtk2-devel kdelibs3-devel krb5 libexif libsndfile-devel mono-devel neon-devel openclipart openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode startup-notification-devel unixODBC-devel xml-commons-apis xorg-x11 xorg-x11-Xvfb zip %ifarch %ix86 -%if %suse_version > 1010 -# FIXME: Sun Java 1.5 is used by default on openSUSE-10.2 -# but the 1.4 bytecode is required -# It seems that I need to hack the related ant files but make it -# optional, so the patch is accepted upstream :-( -# Temorary workaround: add java 1.4 to build requires -BuildRequires: java-1_4_2-sun-devel -%else BuildRequires: java2-devel-packages -%endif %else -BuildRequires: gcc-java java-1_4_2-gcj-compat-devel xalan-j2 xerces-j2 xml-commons-apis +BuildRequires: gcc-java java-1_4_2-gcj-compat-devel %if %suse_version > 1010 -# /usr/bin/gij has been split into separate package in openSUSE-10.2 -BuildRequires: gcc-gij +# openSUSE 10.2 gcj related features +BuildRequires: fastjar gcc-gij %endif %endif -%ifarch x86_64 -# FIXME: We should use system sablot on all architectures? -BuildRequires: sablot-devel -%endif %if %suse_version > 1010 -BuildRequires: fastjar gstreamer010-plugins-base-devel mozilla-xulrunner180-devel +BuildRequires: mozilla-xulrunner180-devel %else BuildRequires: gecko-sdk mozilla-xulrunner %endif +# CODE10 features +%if %suse_version > 1000 +BuildRequires: gstreamer010-plugins-base-devel sablot-devel xalan-j2 xerces-j2 xml-commons-apis +%endif # test_build_langs: 0 = only en-US # 1 = en-US, de, and cs # 2 = all supported languages @@ -98,12 +89,12 @@ %define ooo_prefix %_libdir %define ooo_home ooo-2.0 %define ooo_build_dir build -%define ooo_build_version ood680-m4 -%define ooo_build_tag ood680-m4 +%define ooo_build_version 2.0.4 +%define ooo_build_tag OOO_2_0_4 License: LGPL, BSD Group: Productivity/Office/Suite Version: 2.0.4 -Release: 7 +Release: 11 Autoreqprov: on PreReq: coreutils /usr/bin/update-mime-database Prereq: %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq} @@ -180,8 +171,10 @@ # FIXME: Ignore errors during python uno components registration until # we fix it for python-1.5 Patch1: ooo-build-ood680-m4-installer-python-registration-no-error.diff -# fix build with xalan-2.7 -Patch2: ooo-build-ood680-m4-xalan-serializer-jar.diff +# sync x86_68 and ix86 features +Patch2: ooo-build-ood680-m4f-distro-config-clean-up.diff +# FIXME: disable incomplete backport +Patch3: ooo-build-2.0.4-disable-broken-wizard-crash-fix.diff Patch100: extra_localizations_sources-about.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1127,6 +1120,7 @@ %patch0 %patch1 %patch2 +%patch3 install -m 644 %{S:1} %{S:2} %{S:3} %{S:7} %{S:9} %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} %{S:15} src/ %if %suse_version <= 930 # some more libraries for older distributions where the system versions are @@ -1212,6 +1206,8 @@ %if %use_gij == yes --with-java=gij \ --with-jdk-home=/usr \ +%else + --with-java-target-version=1.4 \ %endif %endif %if %ooo_build_sdk == yes @@ -1226,7 +1222,8 @@ --disable-post-install-scripts \ --disable-strip %endif -make +# FIXME: try to finish build even with the strange random build crash in officecfg +make || make || make || make %install %ifarch ppc x86_64 @@ -1394,6 +1391,17 @@ test -L "$soffice_symlink" -a ! -r "$soffice_symlink" && rm -f "$soffice_symlink" || true default_wrapper="`ls /usr/lib*/ooo*/program/soffice 2>/dev/null | head -n 1`" test -x "$default_wrapper" -a ! -e "$soffice_symlink" && ln -sf "${default_wrapper#/usr/bin/}" "$soffice_symlink" || true +%if %suse_version > 930 + +%post mono +for dll in cli_basetypes.dll \ + cli_cppuhelper.dll \ + cli_types.dll \ + cli_uno_bridge.dll \ + cli_ure.dll ; do + gacutil -i %ooo_prefix/%ooo_home/program/$dll -package %ooo_home || true +done +%endif %if %with_java != no %triggerin -- mysql-connector-java @@ -2041,6 +2049,37 @@ %endif %changelog -n OpenOffice_org +* Thu Oct 12 2006 - pmladek@suse.cz +- updated to 2.0.4 (final) +- updated ooo-build to version 2.0.4: + * target OOO_2_0_4 + * allow to build older bytecode with newer JDK + * save more space/time/code + * temporary disabled some dangerous speedup fixes + * lots VBA fixes and improvements + * lots 64bit fixes + * input field dialog improvement + * unopkg fails when Setup.xcu is missing + * optional argument issues + * use fontconfig for font fallback + * mozilla certificates detection + * some i18n support added + * build with Xalan >= 2.7.x fix + * bashism fixes + * prebuilt mono dlls update + * wazard crash +- updated extra translation sources: Danish, Greek, Welsh +- forced source="1.4" and target="1.4" for build with Sun java +- removed java-1_4_2-sun-devel from BuildRequires and added back the default + java2-devel-packages +- synced features between x86_64 and ix86 build; synced BuildRequires + accordingly +- enabled gstreamer also when build on SLED10 +- updated the prebuilt cli*.dll [n#209342] +- added postinstall script to put the dlls into GAC +- disabled insufficient fix for the wizard crash +- added hack to start makefile several times to try to finish build even with + the strange random build crash in officecfg * Fri Sep 29 2006 - pmladek@suse.cz - added gcc-gij to BuildRequires for openSUSE-10.2 and higher to fix build on x86_64 and ppc ++++++ cli_types.dll ++++++ Binary files arch/i386/OpenOffice_org/cli_types.dll and /mounts/work_src_done/STABLE/OpenOffice_org/cli_types.dll differ ++++++ cli_types_bridgetest.dll ++++++ Binary files arch/i386/OpenOffice_org/cli_types_bridgetest.dll and /mounts/work_src_done/STABLE/OpenOffice_org/cli_types_bridgetest.dll differ ++++++ extra_localizations_sources.tar.bz2 ++++++ arch/i386/OpenOffice_org/extra_localizations_sources.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/extra_localizations_sources.tar.bz2 differ: char 6544476, line 28414 ++++++ ooo-build-2.0.4-disable-broken-wizard-crash-fix.diff ++++++ --- patches/src680/apply +++ patches/src680/apply @@ -219,7 +219,7 @@ [ Fixes ] # backport revision 1.31.61.1 from cws impress107 to fix crash on # the impress wizard -sd-slideshowimpl-check-for-viewframe.diff, i#69530 +#sd-slideshowimpl-check-for-viewframe.diff, i#69530 # let sd accept uri-list drop, n#183719 sd-accept-uri-list-drop.diff, n#183719, rodo ++++++ ooo-build-ood680-m4.tar.gz -> ooo-build-2.0.4.tar.gz ++++++ ++++ 21044 lines of diff (skipped) ++++++ ooo-build-ood680-m4f-distro-config-clean-up.diff ++++++ --- distro-configs/SUSE-64.conf.in +++ distro-configs/SUSE-64.conf.in @@ -1,7 +1,12 @@ --with-vendor=\"Novell, Inc.\" ---enable-gnome-vfs +--disable-access +--disable-odk +--disable-qadevooo +--enable-libsn +--enable-lockdown +--enable-mono +--enable-symbols --with-ant-home=/usr ---without-myspell-dicts --with-java=gij --with-system-boost --with-system-cairo @@ -17,9 +22,4 @@ --with-system-xerces --with-system-xml-apis --with-xulrunner ---enable-cairo ---enable-libsn ---enable-lockdown ---enable-symbols ---disable-odk ---disable-qadevooo +--without-myspell-dicts --- distro-configs/SUSE.conf.in +++ distro-configs/SUSE.conf.in @@ -2,11 +2,9 @@ --disable-access --disable-odk --disable-qadevooo ---enable-gnome-vfs --enable-libsn --enable-lockdown --enable-mono ---enable-quickstart --with-ant-home=/usr --with-jdk-home=$JAVA_HOME --with-system-boost @@ -17,6 +15,10 @@ --with-system-libxslt --with-system-neon --with-system-odbc-headers +--with-system-sablot --with-system-sndfile +--with-system-xalan +--with-system-xerces +--with-system-xml-apis --with-xulrunner --without-myspell-dicts ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org