[Libreoffice-commits] core.git: instsetoo_native/util scp2/source

[tinderbox]

 instsetoo_native/util/openoffice.lst.in |    4 ++++
 scp2/source/ooo/ooo_brand.scp           |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ca7cbe24cc497384d9b4f7d19d1fff3c84e3ea19
Author: tinderbox <tinderbox at mel.suse.cz>
Date:   Thu Apr 11 14:07:25 2013 +0200

    use only major version for the system installation path on Windows (fdo#62303)
    
    It means the LO-4.1.x will get installed into "LibreOffice 4"
    instead of "LibreOffice 4.1"
    
    Change-Id: Ideae670437fda9847d4ee3a86c4cab079d8da07a

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 9bf1472..0e0975a 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -7,6 +7,7 @@ Globals
             UREPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             URELAYERVERSION 1
             REFERENCEOOOMAJORMINOR 3.4
+            WINDOWSBASISROOTNAME LibreOffice @LIBO_VERSION_MAJOR@
             UNIXBASISROOTNAME libreoffice at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
             HIDELICENSEDIALOG 1
             PACKAGEPREFIX
@@ -96,6 +97,7 @@ LibreOffice_Dev
             PRODUCTNAME LibreOfficeDev
             PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
             PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+            WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@
             UNIXBASISROOTNAME libreofficedev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
             POSTVERSIONEXTENSION
             BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
@@ -193,6 +195,7 @@ LibreOffice_Dev_SDK
             PRODUCTNAME LibreOfficeDev
             PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
             PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+            WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@
             UNIXBASISROOTNAME libreofficedev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
             POSTVERSIONEXTENSION SDK
             BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER at .SDK
@@ -277,6 +280,7 @@ LibreOffice_Dev_Test
             PRODUCTNAME LibreOfficeDev
             PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
             PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+            WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@
             UNIXBASISROOTNAME libreofficedev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
             POSTVERSIONEXTENSION TEST
             BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER at .Test
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index a4106b6..183b8ba 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -31,7 +31,7 @@
 Directory gid_Dir_Brand_Root
     ParentID = PREDEFINED_PROGDIR;
   #ifdef WNT
-    HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
+    HostName = "${WINDOWSBASISROOTNAME}";
   #else
     HostName = ".";
   #endif