include/default.rc                               |    2 +-
 sysui/desktop/freedesktop/freedesktop-menus.spec |    4 ++--
 sysui/productlist.mk                             |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1d1ee29f9fc3b1288bd3b58cb3573cb229cf9b15
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Mon Aug 22 13:05:41 2022 +0200
Commit:     Gabor Kelemen <[email protected]>
CommitDate: Mon Aug 22 13:08:24 2022 +0200

    [CIBO] Make this simpler, similar to CO rebranding here
    
    Change-Id: Ib0cb965d44110884fb75df7e1cd70a71183aede7

diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec 
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index cc30badd0551..8ffc00089001 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -25,7 +25,7 @@ Name: %pkgprefix-freedesktop-menus
 Group: Office
 License: LGPLv3 with MPLv2, ALv2 and others
 Provides: libreoffice-desktop-integration
-Provides: libreofficepoweredbycib-desktop-integration
+Provides: ciboffice-desktop-integration
 Conflicts: %pkgprefix-suse-menus
 Conflicts: %pkgprefix-debian-menus
 Conflicts: %pkgprefix-redhat-menus
@@ -391,7 +391,7 @@ done
 # 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" != "libreofficepoweredbycib%productversion" && 
"%unixfilename" != "libreofficepoweredbycibdev%productversion"
+%if "%unixfilename" != "ciboffice%productversion" && "%unixfilename" != 
"cibofficedev%productversion"
 # compat symlinks
 %attr(0755,root,root) /opt/%unixfilename
 %endif
diff --git a/sysui/productlist.mk b/sysui/productlist.mk
index 71b74cb3580f..2992e2f921e4 100644
--- a/sysui/productlist.mk
+++ b/sysui/productlist.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-PRODUCTLIST := libreoffice libreofficedev ciboffice
+PRODUCTLIST := ciboffice
 PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)
 PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)
 PRODUCTNAME.libreoffice := LibreOffice
commit 97862097f96cfb557676cc9f973f0024bb07b613
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Mon Aug 22 12:03:39 2022 +0200
Commit:     Gabor Kelemen <[email protected]>
CommitDate: Mon Aug 22 13:08:24 2022 +0200

    [CIBO] Rebrand in dll metadata as well
    
    inspiration by commit e32e0124f8da122af300210e637362832298ba96
    
    Change-Id: If4a6d326a16addd96b1e602990e2164181db7492

diff --git a/include/default.rc b/include/default.rc
index 5474d55c4c0a..40bcb28d2b57 100644
--- a/include/default.rc
+++ b/include/default.rc
@@ -45,7 +45,7 @@ VS_VERSION_INFO VERSIONINFO
             {
                 // International StringTable
                 VALUE "CompanyName",      PPS(RES_APP_VENDOR) "\0"
-                VALUE "ProductName",      "LibreOffice\0"
+                VALUE "ProductName",      "CIB Office\0"
                 VALUE "ProductVersion",   PPS(VER_LEVEL) "\0"
                 VALUE "FileVersion",      PPS(VER_LEVEL) "\0"
                 VALUE "OriginalFilename", PPS(ORG_NAME) "\0"

Reply via email to