sysui/desktop/freedesktop/freedesktop-menus.spec | 4 ++--
sysui/productlist.mk | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit c8d0fc52b6887261544686fb670415cdbca65eec
Author: Balazs Varga <balazs.varga.ext...@allotropia.de>
AuthorDate: Mon Aug 28 18:36:44 2023 +0200
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Mon Aug 28 20:58:41 2023 +0200
Branding for ZetaOffice without any branding image
Branding ZetaOffice part 3.
Follow-up of commits:
cfd974387f53c2e86efa50491af79c19b2da6195
21385708d1dad4087fe113f293fb50980a8e7460
Change-Id: Ic27257e001005110375401ec2cc02cb4f52f0a88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156208
Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 0b8659b5d7c2..6a28c66051c2 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -24,7 +24,7 @@ Name: %pkgprefix-freedesktop-menus
#BuildRequires: perl
Group: Office
License: LGPLv3 with MPLv2, ALv2 and others
-Provides: libreoffice-desktop-integration
+Provides: zetaoffice-desktop-integration
Conflicts: %pkgprefix-suse-menus
Conflicts: %pkgprefix-debian-menus
Conflicts: %pkgprefix-redhat-menus
@@ -375,7 +375,7 @@ fi
# glibc breaks rpm unless rpm is build with internal glob-matching (issue
49374)
# https://bugzilla.redhat.com/beta/show_bug.cgi?id=134362
%defattr(-, root, root)
-%if "%unixfilename" != "zetaoffice" && "%unixfilename" != "zetaofficedev"
+%if "%unixfilename" != "zetaoffice%productversion" && "%unixfilename" !=
"zetaofficedev%productversion"
# compat symlinks
%attr(0755,root,root) /opt/%unixfilename
%endif
diff --git a/sysui/productlist.mk b/sysui/productlist.mk
index ac0ee4d35501..4f18f2cbf636 100644
--- a/sysui/productlist.mk
+++ b/sysui/productlist.mk
@@ -7,14 +7,12 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-PRODUCTLIST := zetaoffice
+PRODUCTLIST := zetaoffice zetaofficedev
PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)
PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)
-PRODUCTNAME.libreoffice := LibreOffice
-PRODUCTNAME.libreofficedev := LibreOfficeDev
PRODUCTNAME.zetaoffice := ZetaOffice
-UNIXFILENAME.libreoffice := libreoffice$(PKGVERSIONSHORT)
-UNIXFILENAME.libreofficedev := libreofficedev$(PKGVERSIONSHORT)
-UNIXFILENAME.zetaoffice := zetaoffice
+PRODUCTNAME.zetaofficedev := ZetaOfficeDev
+UNIXFILENAME.zetaoffice := zetaoffice$(PKGVERSIONSHORT)
+UNIXFILENAME.zetaofficedev := zetaofficedev$(PKGVERSIONSHORT)
# vim: set noet sw=4 ts=4:
