diff options
| author | Andras Timar <andras.timar@collabora.com> | 2023-05-23 15:16:26 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-11-09 17:13:34 +0100 |
| commit | d9ccfb162f211565ea8e98ae58ab4199eac22452 (patch) | |
| tree | 18a63be777bcd982b479e7c88283ac505334d799 | |
| parent | ec3ffe62685f9c5e944ae0924a9963fbe016a706 (diff) | |
replace license in package header to MPL-2.0 in case of MPL subset
Change-Id: I0ba75ff7da69a3a45afde3252de272aa18f69932
(cherry picked from commit fb228423017d2fce4491232f66299be6aa78b3d9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158672
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 65cedd785904..39767d4e9da9 100644 --- a/configure.ac +++ b/configure.ac @@ -14732,6 +14732,7 @@ dnl =================================================================== AC_MSG_CHECKING([MPL subset]) MPL_SUBSET= +LICENSE="LGPL" if test "$enable_mpl_subset" = "yes"; then mpl_error_string= @@ -14783,12 +14784,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 fb0ff9c81f9d..b5da0bfb6697 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -57,7 +57,7 @@ LibreOffice 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 @@ -100,7 +100,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 @@ -138,7 +138,7 @@ LibreOffice_SDK DMG_VOLUMEEXTENSION SDK DATABASENAME libreoffice40sdk NO_README_IN_ROOTDIR 1 - LICENSENAME LGPL + LICENSENAME @LICENSE@ IGNOREDIRECTORYLAYER 1 NOVERSIONINDIRNAME 0 NOSPACEINDIRECTORYNAME 1 @@ -179,7 +179,7 @@ LibreOfficeDev_SDK DMG_VOLUMEEXTENSION SDK DATABASENAME libreoffice40devsdk NO_README_IN_ROOTDIR 1 - LICENSENAME LGPL + LICENSENAME @LICENSE@ IGNOREDIRECTORYLAYER 1 NOVERSIONINDIRNAME 0 NOSPACEINDIRECTORYNAME 1 |