Hello community,
here is the log from the commit of package OpenOffice_org-ure for openSUSE:Factory
checked in at Sat Jun 20 02:11:04 CEST 2009.
--------
--- OpenOffice_org-ure/OpenOffice_org-ure.changes 2009-05-28 20:14:39.000000000 +0200
+++ OpenOffice_org-ure/OpenOffice_org-ure.changes 2009-06-17 21:40:54.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Jun 17 21:34:15 CEST 2009 - pmladek@suse.cz
+
+- updated prebuilt cli dlls for PPC and SLED10
+
+-------------------------------------------------------------------
+Mon Jun 15 21:16:25 CEST 2009 - pmladek@suse.cz
+
+- updated to the milestone ooo310-m13
+- updated ooo-build to version 3.1.0.98.1 (3.1.1-alpha1)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ooo310-m11-sdk.tar.bz2
ooo310-m11-ure.tar.bz2
ooo-cli-prebuilt-3.1.tar.bz2
New:
----
ooo310-m13-sdk.tar.bz2
ooo310-m13-ure.tar.bz2
ooo-cli-prebuilt-3.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenOffice_org-ure.spec ++++++
--- /var/tmp/diff_new_pack.l24786/_old 2009-06-20 02:08:19.000000000 +0200
+++ /var/tmp/diff_new_pack.l24786/_new 2009-06-20 02:08:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package OpenOffice_org-ure (Version 3.1.0.6)
+# spec file for package OpenOffice_org-ure (Version 3.1.0.98.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,17 +19,17 @@
Name: OpenOffice_org-ure
-Version: 3.1.0.6
-Release: 2
-%define ooo_build_version 3.1.0.6
+Version: 3.1.0.98.1
+Release: 1
+%define ooo_build_version 3.1.0.98.1
%define piece ure
#!BuildIgnore: OpenOffice_org
BuildRequires: OpenOffice_org-bootstrap = %version
BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis xorg-x11 zip
%define ooo_prefix %_libdir
%define ooo_home ooo3
-%define ooo_build_tag ooo310-m11
-License: GPL v2 or later; GPL v3 or later; LGPL v2.1 or later; X11/MIT
+%define ooo_build_tag ooo310-m13
+License: Artistic License .. ; BSD 3-clause (or similar) ; GPL v2 or later ; LPPL .. ; LGPL v2.1 or later ; LGPL v3 only ; MPL .. ; MIT License (or similar)
Group: Productivity/Office/Suite
AutoReqProv: on
Summary: OpenOffice.org UNO Runtime Environment
@@ -37,7 +37,7 @@
Source0: %ooo_build_tag-%piece.tar.bz2
Source1: %ooo_build_tag-sdk.tar.bz2
# prebuilt mono dlls for older distributions and ppc
-Source100: ooo-cli-prebuilt-3.1.tar.bz2
+Source100: ooo-cli-prebuilt-3.1.1.tar.bz2
# necessary for SDK, http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html
# FIXME: can be built using mingw32 C++ compiler
Source101: unowinreg.dll
@@ -100,7 +100,7 @@
Requires: OpenOffice_org-bootstrap = %version
Provides: OpenOffice_org-sdk = %version
Obsoletes: OpenOffice_org-sdk <= %version
-License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+License: Artistic License .. ; BSD 3-clause (or similar) ; GPL v2 or later ; LPPL .. ; LGPL v2.1 or later ; LGPL v3 only ; MPL .. ; MIT License (or similar)
Summary: OpenOffice.org URE Development
Group: Productivity/Office/Suite
AutoReqProv: off
@@ -115,7 +115,7 @@
Requires: %name-devel = %version
Provides: OpenOffice_org-sdk-doc = %version
Obsoletes: OpenOffice_org-sdk-doc <= %version
-License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+License: Artistic License .. ; BSD 3-clause (or similar) ; GPL v2 or later ; LPPL .. ; LGPL v2.1 or later ; LGPL v3 only ; MPL .. ; MIT License (or similar)
Summary: OpenOffice.org URE Development
Group: Productivity/Office/Suite
AutoReqProv: off
@@ -211,6 +211,11 @@
%defattr(-,root,root)
%changelog
+* Wed Jun 17 2009 pmladek@suse.cz
+- updated prebuilt cli dlls for PPC and SLED10
+* Mon Jun 15 2009 pmladek@suse.cz
+- updated to the milestone ooo310-m13
+- updated ooo-build to version 3.1.0.98.1 (3.1.1-alpha1)
* Thu May 28 2009 pmladek@suse.cz
- updated ooo-build to version 3.1.0.6 (3.1-rc7 == final)
* Tue May 26 2009 pmladek@suse.cz
++++++ ooo310-m11-sdk.tar.bz2 -> ooo310-m13-sdk.tar.bz2 ++++++
++++++ ooo310-m11-ure.tar.bz2 -> ooo310-m13-ure.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m11-ure/cli_ure/version/version.txt new/ooo310-m13-ure/cli_ure/version/version.txt
--- old/ooo310-m11-ure/cli_ure/version/version.txt 2009-02-03 13:49:02.000000000 +0100
+++ new/ooo310-m13-ure/cli_ure/version/version.txt 2009-06-09 11:15:51.000000000 +0200
@@ -29,23 +29,23 @@
#
#*************************************************************************
-CLI_URETYPES_NEW_VERSION=1.0.2.0
-CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.1.0
-CLI_URETYPES_POLICY_VERSION=2.0.0.0
+CLI_URETYPES_NEW_VERSION=1.0.3.0
+CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.2.0
+CLI_URETYPES_POLICY_VERSION=3.0.0.0
CLI_URETYPES_POLICY_ASSEMBLY=policy.1.0.cli_uretypes
-CLI_BASETYPES_NEW_VERSION=1.0.13.0
-CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.12.0
-CLI_BASETYPES_POLICY_VERSION=13.0.0.0
+CLI_BASETYPES_NEW_VERSION=1.0.14.0
+CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.13.0
+CLI_BASETYPES_POLICY_VERSION=14.0.0.0
CLI_BASETYPES_POLICY_ASSEMBLY=policy.1.0.cli_basetypes
-CLI_URE_NEW_VERSION=1.0.16.0
-CLI_URE_OLD_VERSION=1.0.0.0-1.0.15.0
-CLI_URE_POLICY_VERSION=16.0.0.0
+CLI_URE_NEW_VERSION=1.0.17.0
+CLI_URE_OLD_VERSION=1.0.0.0-1.0.16.0
+CLI_URE_POLICY_VERSION=17.0.0.0
CLI_URE_POLICY_ASSEMBLY=policy.1.0.cli_ure
-CLI_CPPUHELPER_NEW_VERSION=1.0.16.0
-CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.15.0
-CLI_CPPUHELPER_POLICY_VERSION=16.0.0.0
+CLI_CPPUHELPER_NEW_VERSION=1.0.17.0
+CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.16.0
+CLI_CPPUHELPER_POLICY_VERSION=17.0.0.0
CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m11-ure/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx new/ooo310-m13-ure/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
--- old/ooo310-m11-ure/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 2009-03-26 18:59:31.000000000 +0100
+++ new/ooo310-m13-ure/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 2009-06-09 10:12:06.000000000 +0200
@@ -106,7 +106,7 @@
errcode = jfw_existJRE(pInfo, &bExist);
if (errcode == JFW_E_NONE)
{
- if (false == findAndSelect(&pInfo))
+ if (!bExist && !findAndSelect(&pInfo))
return -1;
}
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m11-ure/jvmfwk/plugins/sunmajor/pluginlib/util.cxx new/ooo310-m13-ure/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
--- old/ooo310-m11-ure/jvmfwk/plugins/sunmajor/pluginlib/util.cxx 2008-05-13 16:03:28.000000000 +0200
+++ new/ooo310-m13-ure/jvmfwk/plugins/sunmajor/pluginlib/util.cxx 2009-06-10 11:16:43.000000000 +0200
@@ -740,9 +740,10 @@
//Otherwise in SDKs Java may be started twice
createJavaInfoFromPath(vecInfos);
-#ifdef UNX
+#ifdef UNX
createJavaInfoDirScan(vecInfos);
#endif
+
bubbleSortVersion(vecInfos);
return vecInfos;
}
@@ -1114,6 +1115,15 @@
}
#ifdef UNX
+#ifdef SOLARIS
+
+void createJavaInfoDirScan(vector