Hello community, here is the log from the commit of package OpenOffice_org checked in at Wed Nov 29 07:41:12 CET 2006. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2006-11-20 22:51:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/OpenOffice_org/OpenOffice_org.changes 2006-11-28 21:31:28.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 28 21:30:33 CET 2006 - pmladek@suse.cz + +- hot fix: gij32 must be checked before gij to be found [#222708] + +------------------------------------------------------------------- Old: ---- minmem New: ---- ooo-build-2.0.4.7-find-gij32.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.8RjXKJ/_old 2006-11-29 07:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.8RjXKJ/_new 2006-11-29 07:39:17.000000000 +0100 @@ -89,7 +89,7 @@ License: Artistic License, Other License(s), see package Group: Productivity/Office/Suite Version: 2.0.4 -Release: 34 +Release: 36 Autoreqprov: on PreReq: coreutils /usr/bin/update-mime-database Prereq: %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq} @@ -170,6 +170,8 @@ # obsolete wrapper, removed in openSUSE 10.2 Source600: OOo-wrapper %endif +# Hot fix, gij32 must be checked before gij to be found [n#222708] +Patch: ooo-build-2.0.4.7-find-gij32.diff Patch100: extra_localizations_sources-about.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1130,6 +1132,7 @@ %setup -D -T -q -n ooo-build-%ooo_build_version %else %setup -q -n ooo-build-%ooo_build_version +%patch install -m 644 %{S:1} %{S:2} %{S:3} %{S:6} %{S:7} %{S:8} %{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 @@ -2061,6 +2064,8 @@ %endif %changelog -n OpenOffice_org +* Tue Nov 28 2006 - pmladek@suse.cz +- hot fix: gij32 must be checked before gij to be found [#222708] * Mon Nov 20 2006 - pmladek@suse.cz - updated ooo-build to version 2.0.4.7: * wrong calculation in Calc, r1c1 stuff [i#71455, i#221421] ++++++ ooo-build-2.0.4.7-find-gij32.diff ++++++ --- patches/src680/apply +++ patches/src680/apply @@ -595,6 +595,7 @@ # search also gij32, ..., so the 32-bit package works on 64-bit jvmfwk-gij32.diff, n#222708, pmladek +jvmfwk-gij32-2.diff, n#222708, pmladek [ NotDebian ] --- patches/src680/jvmfwk-gij32-2.diff +++ patches/src680/jvmfwk-gij32-2.diff @@ -0,0 +1,31 @@ +--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx.old 2006-11-20 22:58:39.000000000 +0100 ++++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 2006-11-28 20:57:36.000000000 +0100 +@@ -53,21 +53,20 @@ + char const* const* GnuInfo::getJavaExePaths(int * size) + { + static char const * ar[] = { +- "gij", +- "bin/gij", +- "gij-4.1", +- "bin/gij-4.1", +- "gij-4.2", +- "bin/gij-4.2" + #if defined(__i386__) +- , + "gij32", + "bin/gij32", + "gij32-4.1", + "bin/gij32-4.1", + "gij32-4.2", +- "bin/gij32-4.2" ++ "bin/gij32-4.2," + #endif ++ "gij", ++ "bin/gij", ++ "gij-4.1", ++ "bin/gij-4.1", ++ "gij-4.2", ++ "bin/gij-4.2" + }; + *size = sizeof (ar) / sizeof (char*); + return ar; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org