[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - instsetoo_native/util

[Andras Timar (via logerrit)]

 instsetoo_native/util/openoffice.lst.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9d8003b12a1a1b7a4469764e2d3766a0d073b8b9
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Apr 3 11:40:10 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Apr 3 11:40:10 2019 +0200

    [cp] license file locations for install sets
    
    License files can be in SRCDIR ({licensepath}). In fact we set {licensepath}
    in solenv/bin/modules/installer/environment.pm:
        my $licensepath = $environment->{'SRCDIR'} . $installer::globals::separator . "readlicense_oo/license";
    For example EULA_en-US.rtf is taken from here in Collabora Office.
    
    Generated license files, such as LICENSE in text format for Linux packaging
    are located in {customtargetpath}/readlicense_oo/license
    
    Change-Id: Ieb1f3f4f1673ed8a2b2e975bbce928a8005182e1

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 721e6788fd0d..713d9917c3f4 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -81,7 +81,7 @@ CollaboraOffice
         downloadname    CollaboraOffice_{productversion}_{os}_install_{languages}
         langpackdownloadname    CollaboraOffice_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    CollaboraOffice_{productversion}_helppack_{os}_install_{languages}
-        include         {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{packinfopath}
+        include         {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath}
     }
 }
 
@@ -134,7 +134,7 @@ LibreOfficeDev
         downloadname    LibreOfficeDev_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-        include         {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{packinfopath}
+        include         {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath}
     }
 }
 
@@ -173,7 +173,7 @@ LibreOffice_SDK
         active 1
         compression 5
         script sdkoo
-        include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath}
+        include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath}
     }
 }
 
@@ -219,6 +219,6 @@ LibreOfficeDev_SDK
         active 1
         compression 5
         script sdkoo
-        include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath}
+        include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath}
     }
 }