instsetoo_native/util/openoffice.lst.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit 74ae98751dc445a8b4f365da04b131233c5176f7 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Nov 13 11:20:15 2024 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Nov 13 12:47:15 2024 +0100 Roll out PRODUCTEXTENSION, PACKAGEVERSION changes across all products 5ce7a548004c9e5cdcd8ee7eb5424f234219d180 "Branding for ZetaOffice without any branding image" had only done them for the ZetaOffice product (and that caused e.g. a generated zetaofficebasis24.2-sdk-24.2.8.0.beta1-1.x86_64.rpm to not be installable, as it had a non-matching "zetaofficebasis24.2-core >= 24.2.8.0.beta1" dependency) Change-Id: I60c180274480b0fc8038a69bf12b390071acf5c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176525 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: allotropia jenkins <[email protected]> diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index b662521b00d9..f2231afe00af 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -90,7 +90,7 @@ ZetaOfficeDev { PRODUCTNAME ZetaOfficeDev PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ + PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@ WINDOWSBASISROOTNAME ZetaOfficeDev @LIBO_VERSION_MAJOR@ UNIXBASISROOTNAME zetaofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ POSTVERSIONEXTENSION @@ -106,7 +106,7 @@ ZetaOfficeDev UPDATEURL https://update.libreoffice.org/check.php ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt ADDSYSTEMINTEGRATION 1 - PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ + PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@ PACKAGEREVISION {buildid} LICENSENAME @LICENSE@ ROOTMODULEGID gid_Module_Root @@ -141,11 +141,11 @@ ZetaOffice_SDK { PRODUCTNAME ZetaOffice PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ + PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@ POSTVERSIONEXTENSION SDK BUNDLEIDENTIFIER @[email protected] BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ + PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@ PACKAGEREVISION {buildid} PACK_INSTALLED 1 DMG_VOLUMEEXTENSION SDK @@ -179,13 +179,13 @@ ZetaOfficeDev_SDK { PRODUCTNAME ZetaOfficeDev PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ + PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@ WINDOWSBASISROOTNAME ZetaOfficeDev @LIBO_VERSION_MAJOR@ UNIXBASISROOTNAME zetaofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ POSTVERSIONEXTENSION SDK BUNDLEIDENTIFIER @[email protected] BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ + PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@ PACKAGEREVISION {buildid} BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX zetaofficedev
