Hello community,
here is the log from the commit of package OpenOffice_org
checked in at Wed Sep 27 23:30:18 CEST 2006.
--------
--- arch/i386/OpenOffice_org/OpenOffice_org.changes 2006-09-05 12:27:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org.changes 2006-09-27 22:20:29.000000000 +0200
@@ -1,0 +2,34 @@
+Thu Sep 21 18:50:59 CEST 2006 - pmladek(a)suse.cz
+
+- updated to snapshot ood680-m4 (2.0.4-rc2)
+- updated ooo-build to version ood680-m4:
+ + target ood680-m4
+ + more shrink apparent & real memory use
+ + lots gstreamer fixes and improvements
+ + better error handling in r1c1 stuff
+ + lots VBA fixes and improvements
+ + r1c1 and VBA
+ + find the mozilla certificate dir
+ + "Save As" crash regression fix
+ + java.home property to gnujre searchpath
+ + missing stuff for getopt/readdir_r from system glibc
+ + support for evolution-data-server-1.8
+ + temporary fix for gcc >= 4.1.2 20060913
+ + correct build and installation of the mono stuff
+- updated extra translation sources: African, Belorussian, Bulgarian, Czech,
+ Danish, Estonian, Greek, Finnish, Latvian, Macedonia, Norwegian Bokmaal,
+ Norwegian Nynorsk, Slovak, Slovene, Sotho, Tsonga, Welsh, Xhosa, Zulu
+- temporary added java-1_4_2-sun-devel to BuildRequires for openSUSE-10.2
+ to build the Java 1.4 compatible bytecode; it is needed until we make the
+ target bytecode optional
+- temporary added gcc41-gij to BuildRequires until the dependency from
+ gcc-java is fixed
+- temporary added hack to ignore python UNO component registration problems;
+ it is needed until we fix it with python-2.5
+- added mozilla-xulrunner to BuildRequires for older distributions to
+ help to resolve dependencies
+- added the new mono-ooo-2.0.pc to the mono subpackage; it did not make
+ sense to do the mono-devel subpackage
+- fixed build with xalan-2.7
+
+-------------------------------------------------------------------
Old:
----
minmem
ood680-m2-binfilter.tar.bz2
ood680-m2-core.tar.bz2
ood680-m2-lang.tar.bz2
ood680-m2-sdk_oo.tar.bz2
ood680-m2-system.tar.bz2
ooo-build-ood680-m2-eds-2.0-soname.diff
ooo-build-ood680-m2-save-as.diff
ooo-build-ood680-m2.tar.gz
New:
----
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-installer-python-registration-no-error.diff
ooo-build-ood680-m4-xalan-serializer-jar.diff
ooo-build-ood680-m4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenOffice_org.spec ++++++
--- /var/tmp/diff_new_pack.JhdQEh/_old 2006-09-27 23:28:54.000000000 +0200
+++ /var/tmp/diff_new_pack.JhdQEh/_new 2006-09-27 23:28:54.000000000 +0200
@@ -13,9 +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
+%if %suse_version > 1010
+# FIXME: gij is part of gcc-java and is a symlink to gij-4.1 now
+# gij-4.1 is part of gcc41-gij that is not required by gcc-java
+BuildRequires: gcc41-gij
+%endif
%endif
%ifarch x86_64
# FIXME: We should use system sablot on all architectures?
@@ -24,7 +38,7 @@
%if %suse_version > 1010
BuildRequires: fastjar gstreamer010-plugins-base-devel mozilla-xulrunner180-devel
%else
-BuildRequires: gecko-sdk
+BuildRequires: gecko-sdk mozilla-xulrunner
%endif
# test_build_langs: 0 = only en-US
# 1 = en-US, de, and cs
@@ -85,12 +99,12 @@
%define ooo_prefix %_libdir
%define ooo_home ooo-2.0
%define ooo_build_dir build
-%define ooo_build_version ood680-m2
-%define ooo_build_tag ood680-m2
+%define ooo_build_version ood680-m4
+%define ooo_build_tag ood680-m4
License: LGPL, BSD
Group: Productivity/Office/Suite
Version: 2.0.4
-Release: 3
+Release: 6
Autoreqprov: on
PreReq: coreutils /usr/bin/update-mime-database
Prereq: %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq}
@@ -164,10 +178,11 @@
%endif
# FIXME: temporary disable all size shrink patches
Patch0: ooo-build-ood680-m2-no-size-shrink.diff
-# FIXME: hot fix for the save as dialog
-Patch1: ooo-build-ood680-m2-save-as.diff
-# FIXME: hot fix for new evolution-data-server-2.8
-Patch2: ooo-build-ood680-m2-eds-2.0-soname.diff
+# 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
Patch100: extra_localizations_sources-about.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -1870,6 +1885,7 @@
%files -f %ooo_build_dir/mono_list.txt mono
%defattr(-,root,root)
+/usr/lib/pkgconfig/mono-ooo-2.0.pc
%endif
%if %with_java != no
@@ -2026,6 +2042,37 @@
%endif
%changelog -n OpenOffice_org
+* Thu Sep 21 2006 - pmladek(a)suse.cz
+- updated to snapshot ood680-m4 (2.0.4-rc2)
+- updated ooo-build to version ood680-m4:
+ + target ood680-m4
+ + more shrink apparent & real memory use
+ + lots gstreamer fixes and improvements
+ + better error handling in r1c1 stuff
+ + lots VBA fixes and improvements
+ + r1c1 and VBA
+ + find the mozilla certificate dir
+ + "Save As" crash regression fix
+ + java.home property to gnujre searchpath
+ + missing stuff for getopt/readdir_r from system glibc
+ + support for evolution-data-server-1.8
+ + temporary fix for gcc >= 4.1.2 20060913
+ + correct build and installation of the mono stuff
+- updated extra translation sources: African, Belorussian, Bulgarian, Czech,
+ Danish, Estonian, Greek, Finnish, Latvian, Macedonia, Norwegian Bokmaal,
+ Norwegian Nynorsk, Slovak, Slovene, Sotho, Tsonga, Welsh, Xhosa, Zulu
+- temporary added java-1_4_2-sun-devel to BuildRequires for openSUSE-10.2
+ to build the Java 1.4 compatible bytecode; it is needed until we make the
+ target bytecode optional
+- temporary added gcc41-gij to BuildRequires until the dependency from
+ gcc-java is fixed
+- temporary added hack to ignore python UNO component registration problems;
+ it is needed until we fix it with python-2.5
+- added mozilla-xulrunner to BuildRequires for older distributions to
+ help to resolve dependencies
+- added the new mono-ooo-2.0.pc to the mono subpackage; it did not make
+ sense to do the mono-devel subpackage
+- fixed build with xalan-2.7
* Thu Aug 31 2006 - pmladek(a)suse.cz
- updated to snapshot ood680-m2 (2.0.4-rc-pre)
- updated ooo-build to version ood680-m2:
++++++ 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 11, line 1
++++++ ood680-m2-binfilter.tar.bz2 -> ood680-m4-binfilter.tar.bz2 ++++++
arch/i386/OpenOffice_org/ood680-m2-binfilter.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ood680-m4-binfilter.tar.bz2 differ: char 11, line 1
++++++ ood680-m2-core.tar.bz2 -> ood680-m4-core.tar.bz2 ++++++
arch/i386/OpenOffice_org/ood680-m2-core.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ood680-m4-core.tar.bz2 differ: char 11, line 1
++++++ ood680-m2-lang.tar.bz2 -> ood680-m4-lang.tar.bz2 ++++++
arch/i386/OpenOffice_org/ood680-m2-lang.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ood680-m4-lang.tar.bz2 differ: char 11, line 1
++++++ ood680-m2-sdk_oo.tar.bz2 -> ood680-m4-sdk_oo.tar.bz2 ++++++
arch/i386/OpenOffice_org/ood680-m2-sdk_oo.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ood680-m4-sdk_oo.tar.bz2 differ: char 11, line 1
++++++ ood680-m2-system.tar.bz2 -> ood680-m4-system.tar.bz2 ++++++
arch/i386/OpenOffice_org/ood680-m2-system.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ood680-m4-system.tar.bz2 differ: char 11, line 1
++++++ ooo-build-ood680-m4-installer-python-registration-no-error.diff ++++++
--- patches/src680/apply
+++ patches/src680/apply
@@ -159,6 +159,11 @@
# is compiled with -Os with gcc 4.1.2 20060913
svtools-fsstor-temporary-O0.diff
+# FIXME: Ignore errors during python uno components registration until
+# we fix it for python-1.5
+installer-python-registration-no-error.diff
+
+
# [ LinuxOnly ]
# use fontconfig for font fallback
--- patches/src680/installer-python-registration-no-error.diff
+++ patches/src680/installer-python-registration-no-error.diff
@@ -0,0 +1,12 @@
+--- solenv/bin/modules/installer/servicesfile.pm.old 2006-07-10 20:51:00.000000000 +0200
++++ solenv/bin/modules/installer/servicesfile.pm 2006-09-26 19:52:08.000000000 +0200
+@@ -403,7 +403,8 @@
+ {
+ $infoline = "ERROR: $systemcall\n";
+ push( @installer::globals::logfileinfo, $infoline);
+- $error_occured = 1;
++# FIXME: Ignore the python registration problems for now
++# $error_occured = 1;
+ }
+ else
+ {
++++++ ooo-build-ood680-m4-xalan-serializer-jar.diff ++++++
--- patches/src680/xalan-serializer-jar.diff
+++ patches/src680/xalan-serializer-jar.diff
@@ -1,7 +1,7 @@
diff -Nur config_office.orig/configure.in config_office/configure.in
--- config_office.orig/configure.in 2006-04-29 17:30:48.000000000 +0200
+++ config_office/configure.in 2006-04-29 17:46:34.000000000 +0200
-@@ -297,6 +297,10 @@
+@@ -313,6 +313,10 @@
[ --with-xalan-jar=JARFILE Specify path to jarfile manually ],
[ XALAN_JAR="$withval"
])
@@ -12,18 +12,41 @@
AC_ARG_WITH(system-sablot,
[ --with-system-sablot Use sablot already on system
],,)
-@@ -2908,6 +2912,11 @@
+@@ -3119,6 +3123,26 @@
AC_CHECK_FILE($XALAN_JAR, [],
[AC_MSG_ERROR(xalan.jar replacement not found.)], [])
fi
-+ if test -n "$SERIALIZER_JAR"; then
++ if test -z "$SERIALIZER_JAR"; then
++ # FIXME: add check for xalan version to know when serializer.jar
++ # is required
++ AC_CHECK_FILE(/usr/share/java/xalan-j2-serializer.jar,
++ [ SERIALIZER_JAR=/usr/share/java/xalan-j2-serializer.jar ],
++ [
++ AC_CHECK_FILE(/usr/share/java/xalan2-serializer.jar,
++ [ SERIALIZER_JAR=/usr/share/java/xalan2-serializer.jar ],
++ [ AC_CHECK_FILE(/usr/share/java/serializer.jar,
++ [ SERIALIZER_JAR=/usr/share/java/serializer.jar ],
++ [], []
++ )
++ ]
++ )
++ ]
++ )
++ else
+ AC_CHECK_FILE($SERIALIZER_JAR, [],
+ [AC_MSG_ERROR(serializer.jar not found.)], [])
-+ AC_SUBST(SERIALIZER_JAR)
+ fi
else
AC_MSG_RESULT([internal])
SYSTEM_XALAN=NO
+@@ -3126,6 +3150,7 @@
+ fi
+ AC_SUBST(SYSTEM_XALAN)
+ AC_SUBST(XALAN_JAR)
++AC_SUBST(SERIALIZER_JAR)
+
+ if test -n "$NEED_XALAN"; then
+ BUILD_TYPE="$BUILD_TYPE XALAN"
diff -Nur config_office.orig/set_soenv.in config_office/set_soenv.in
--- config_office.orig/set_soenv.in 2006-04-29 17:31:15.000000000 +0200
+++ config_office/set_soenv.in 2006-04-29 17:47:03.000000000 +0200
@@ -35,6 +58,27 @@
ToFile( "SYSTEM_XT", "@SYSTEM_XT@", "e" );
ToFile( "XT_JAR", "@XT_JAR@", "e" );
ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" );
+diff -Nur filter.orig/source/config/fragments/makefile.mk filter/source/config/fragments/makefile.mk
+--- filter.orig/source/config/fragments/makefile.mk 2006-09-27 17:09:06.000000000 +0200
++++ filter/source/config/fragments/makefile.mk 2006-09-27 17:09:12.000000000 +0200
+@@ -159,8 +159,15 @@
+ .ENDIF
+
+ .IF "$(XSLTPROC)"=="NO_XSLTPROC"
+-XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
+-PACKLANG := $(JAVAI) $(JAVACPS) $(XALAN_JAR) org.apache.xalan.xslt.Process -XSL langfilter.xsl
++.IF "$(SYSTEM_XALAN)" == "YES"
++XCLASSPATH!:=$(XALAN_JAR)
++.IF "$(SERIALIZER_JAR)" != ""
++XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SERIALIZER_JAR)
++.ENDIF
++.ELSE
++XCLASSPATH!:=$(SOLARBINDIR)$/xalan.jar
++.ENDIF
++PACKLANG := $(JAVAI) $(JAVACPS) $(XCLASSPATH) org.apache.xalan.xslt.Process -XSL langfilter.xsl
+ PACKLANG_IN := -IN
+ PACKLANG_PARAM := -PARAM
+ PACKLANG_XSL := -XSL
diff -Nur filter.orig/source/xsltfilter/makefile.mk filter/source/xsltfilter/makefile.mk
--- filter.orig/source/xsltfilter/makefile.mk 2006-04-29 18:08:18.000000000 +0200
+++ filter/source/xsltfilter/makefile.mk 2006-04-29 18:09:56.000000000 +0200
++++++ ooo-build-ood680-m2.tar.gz -> ooo-build-ood680-m4.tar.gz ++++++
++++ 29272 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
