[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - configure.ac instsetoo_native/util

[Andras Timar (via logerrit)]

 configure.ac                            |    3 +++
 instsetoo_native/util/openoffice.lst.in |    8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit fb228423017d2fce4491232f66299be6aa78b3d9
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue May 23 15:16:26 2023 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed May 24 08:16:57 2023 +0200

    replace license in package header to MPL-2.0 in case of MPL subset
    
    Change-Id: I0ba75ff7da69a3a45afde3252de272aa18f69932

diff --git a/configure.ac b/configure.ac
index 0fba92098bd0..243f1dba3fc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14496,6 +14496,7 @@ dnl 
===================================================================
 
 AC_MSG_CHECKING([MPL subset])
 MPL_SUBSET=
+LICENSE="LGPL"
 
 if test "$enable_mpl_subset" = "yes"; then
     warn_report=false
@@ -14537,12 +14538,14 @@ if test "$enable_mpl_subset" = "yes"; then
     fi
 
     MPL_SUBSET="TRUE"
+    LICENSE="MPL-2.0"
     AC_DEFINE(MPL_HAVE_SUBSET)
     AC_MSG_RESULT([only])
 else
     AC_MSG_RESULT([no restrictions])
 fi
 AC_SUBST(MPL_SUBSET)
+AC_SUBST(LICENSE)
 
 dnl ===================================================================
 
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index cc8e63a4cbfa..c9503aa531be 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -58,7 +58,7 @@ CollaboraOffice
             ADDSYSTEMINTEGRATION 1
             PACKAGEVERSION 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@
             PACKAGEREVISION @LIBO_VERSION_PATCH@
-            LICENSENAME LGPL
+            LICENSENAME @LICENSE@
             ROOTMODULEGID gid_Module_Root
             GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
             SPELLCHECKERFILE spellchecker_selection.txt
@@ -101,7 +101,7 @@ LibreOfficeDev
             ADDSYSTEMINTEGRATION 1
             PACKAGEVERSION 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             PACKAGEREVISION {buildid}
-            LICENSENAME LGPL
+            LICENSENAME @LICENSE@
             ROOTMODULEGID gid_Module_Root
             GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
             SPELLCHECKERFILE spellchecker_selection.txt
@@ -139,7 +139,7 @@ LibreOffice_SDK
             DMG_VOLUMEEXTENSION SDK
             DATABASENAME libreoffice40sdk
             NO_README_IN_ROOTDIR 1
-            LICENSENAME LGPL
+            LICENSENAME @LICENSE@
             IGNOREDIRECTORYLAYER 1
             NOVERSIONINDIRNAME 0
             NOSPACEINDIRECTORYNAME 1
@@ -180,7 +180,7 @@ LibreOfficeDev_SDK
             DMG_VOLUMEEXTENSION SDK
             DATABASENAME libreoffice40devsdk
             NO_README_IN_ROOTDIR 1
-            LICENSENAME LGPL
+            LICENSENAME @LICENSE@
             IGNOREDIRECTORYLAYER 1
             NOVERSIONINDIRNAME 0
             NOSPACEINDIRECTORYNAME 1