Hello community, here is the log from the commit of package OpenOffice_org-components checked in at Mon Sep 29 18:09:05 CEST 2008. -------- --- OpenOffice_org-components/OpenOffice_org-components.changes 2008-09-11 23:03:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-components/OpenOffice_org-components.changes 2008-09-27 17:25:51.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Sep 27 12:04:54 CEST 2008 - pmladek@suse.cz + +- updated to the milestone ooo300-m7 (3.0rc2) +- updated ooo-build to version 3.0.0.5 + +------------------------------------------------------------------- Old: ---- ooo300-m5-components.tar.bz2 New: ---- ooo300-m7-components.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-components.spec ++++++ --- /var/tmp/diff_new_pack.Y21118/_old 2008-09-29 18:08:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Y21118/_new 2008-09-29 18:08:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-components (Version 3.0.0.4) +# spec file for package OpenOffice_org-components (Version 3.0.0.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-components -Version: 3.0.0.4 +Version: 3.0.0.5 Release: 1 -%define ooo_build_version 3.0.0.4 +%define ooo_build_version 3.0.0.5 %define piece components BuildRequires: OpenOffice_org-artwork-devel = %version BuildRequires: OpenOffice_org-libs-core-devel = %version @@ -46,7 +46,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo300-m5 +%define ooo_build_tag ooo300-m7 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 Group: Productivity/Office/Suite AutoReqProv: on @@ -195,5 +195,8 @@ %ooo_prefix/%ooo_home/solver/noarch %changelog +* Sat Sep 27 2008 pmladek@suse.cz +- updated to the milestone ooo300-m7 (3.0rc2) +- updated ooo-build to version 3.0.0.5 * Thu Sep 11 2008 pmladek@suse.cz - split from the main OpenOffice_org package, version 3.0.0.4 ++++++ ooo300-m5-components.tar.bz2 -> ooo300-m7-components.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo300-m5-components/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java new/ooo300-m7-components/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java --- old/ooo300-m5-components/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java 2008-05-06 12:41:14.000000000 +0200 +++ new/ooo300-m7-components/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/UninstallationPrologueCtrl.java 2008-09-10 15:52:02.000000000 +0200 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: UninstallationPrologueCtrl.java,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.18.1 $ * * This file is part of OpenOffice.org. * @@ -167,6 +167,7 @@ ModuleCtrl.setDatabaseSettings(packageData, installData, installer); installData.setDatabaseAnalyzed(true); ModuleCtrl.setDontUninstallFlags(packageData); + if ( installData.isRootInstallation() ) { ModuleCtrl.setDontUninstallUserInstallOnylFlags(packageData); } ModuleCtrl.setParentDefaultModuleSettings(packageData); getSetupFrame().setButtonEnabled(true, getSetupFrame().BUTTON_NEXT); getSetupFrame().setButtonSelected(getSetupFrame().BUTTON_NEXT); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo300-m5-components/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java new/ooo300-m7-components/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java --- old/ooo300-m5-components/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java 2008-09-02 16:09:38.000000000 +0200 +++ new/ooo300-m7-components/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java 2008-09-10 15:52:17.000000000 +0200 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ModuleCtrl.java,v $ - * $Revision: 1.8.18.4 $ + * $Revision: 1.8.18.5 $ * * This file is part of OpenOffice.org. * @@ -500,9 +500,19 @@ PackageDescription child = (PackageDescription) e.nextElement(); setDontUninstallFlags(child); } - } - + + static public void setDontUninstallUserInstallOnylFlags(PackageDescription packageData) { + if ( packageData.showInUserInstallOnly() ) { + packageData.setSelectionState(PackageDescription.IGNORE); + } + + for (Enumeration e = packageData.children(); e.hasMoreElements(); ) { + PackageDescription child = (PackageDescription) e.nextElement(); + setDontUninstallUserInstallOnylFlags(child); + } + } + static public void checkVisibleModulesInstall(PackageDescription packageData, InstallData data) { boolean setToTrue = false; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo300-m5-components/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx new/ooo300-m7-components/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx --- old/ooo300-m5-components/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx 2008-08-21 17:25:42.000000000 +0200 +++ new/ooo300-m7-components/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx 2008-09-11 16:15:40.000000000 +0200 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: layerlinks.cxx,v $ - * $Revision: 1.4.10.1 $ + * $Revision: 1.4.10.2 $ * * This file is part of OpenOffice.org. * @@ -110,18 +110,9 @@ if ( IsSetMsiProperty(handle, TEXT("ADMININSTALL")) ) { - string sOooBaseVersion = GetMsiProperty(handle, TEXT("OOOBASEVERSION")); - string sBasisRootName = GetMsiProperty(handle, TEXT("BASISROOTNAME")); - if ( IsSetMsiProperty(handle, TEXT("SUNDIREXISTS")) ) - { - sBasisInstallPath = TEXT("..\\..\\") + sBasisRootName + TEXT("\\Basis ") + sOooBaseVersion; - } - else - { - sBasisInstallPath = TEXT("..\\") + sBasisRootName + TEXT("\\Basis ") + sOooBaseVersion; - } + sBasisInstallPath = TEXT("Basis"); sUreInstallPath = TEXT("..\\URE"); - } + } stripFinalBackslash(&sBasisInstallPath); stripFinalBackslash(&sUreInstallPath); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org