From 2821ad6313f3f6bbde4eb919c95fe6e98e8fb34a Mon Sep 17 00:00:00 2001
From: Semyon Bezrukov <semen.bezrukov@onlyoffice.com>
Date: Tue, 9 Jul 2024 17:03:55 +0300
Subject: [PATCH] Fix package name (#1282)

---
 win-linux/package/linux/Makefile        | 21 ++++++---------------
 win-linux/package/linux/rpm/common.spec |  1 -
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/win-linux/package/linux/Makefile b/win-linux/package/linux/Makefile
index a9f5318e2..175a0027b 100644
--- a/win-linux/package/linux/Makefile
+++ b/win-linux/package/linux/Makefile
@@ -18,11 +18,7 @@ PACKAGE_EDITION ?= cool
 
 BRANDING_DIR ?= $(PWD)/branding
 
-ifeq ($(COMPANY_NAME), ONLYOFFICE)
-	PACKAGE_NAME := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW)
-else
-	PACKAGE_NAME := $(COMPANY_NAME_LOW)
-endif
+PACKAGE_NAME := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW)
 PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER)
 
 UNAME_M ?= $(shell uname -m)
@@ -65,13 +61,10 @@ CHANGELOG_RPM = common/usr/share/doc/$(PACKAGE_NAME)/ChangeLog
 CHANGELOG_DEB = deb/build/debian/changelog
 CHANGELOG_DEB_ASTRA = deb-astra/build/debian/changelog
 
-ifeq ($(COMPANY_NAME), ONLYOFFICE)
-	DESKTOPEDITORS_PREFIX := $(COMPANY_NAME_LOW)/$(PRODUCT_NAME_LOW)
-	DESKTOPEDITORS_EXEC := $(PACKAGE_NAME)
-else
-	DESKTOPEDITORS_PREFIX := $(COMPANY_NAME_LOW)/desktopeditors
+DESKTOPEDITORS_PREFIX := $(COMPANY_NAME_LOW)/$(PRODUCT_NAME_LOW)
+DESKTOPEDITORS_EXEC := $(PACKAGE_NAME)
+ifneq ($(COMPANY_NAME), ONLYOFFICE)
 	MEDIAVIEWER_PREFIX := $(COMPANY_NAME_LOW)/mediaviewer
-	DESKTOPEDITORS_EXEC := $(COMPANY_NAME_LOW)-desktopeditors
 	IMAGEVIEWER_EXEC := $(COMPANY_NAME_LOW)-imageviewer
 	VIDEOPLAYER_EXEC := $(COMPANY_NAME_LOW)-videoplayer
 endif
@@ -79,14 +72,12 @@ endif
 LINUX_DEPS += common/usr/share/applications/variables.m4
 BIN_FILES += common/usr/bin/$(DESKTOPEDITORS_EXEC)
 DESKTOP_FILES += common/usr/share/applications/$(DESKTOPEDITORS_EXEC).desktop
-ifeq ($(COMPANY_NAME), ONLYOFFICE)
-	SYMLINK += common/usr/bin/desktopeditors
-else
+SYMLINK += common/usr/bin/desktopeditors
+ifneq ($(COMPANY_NAME), ONLYOFFICE)
 	BIN_FILES += common/usr/bin/$(IMAGEVIEWER_EXEC)
 	BIN_FILES += common/usr/bin/$(VIDEOPLAYER_EXEC)
 	DESKTOP_FILES += common/usr/share/applications/$(IMAGEVIEWER_EXEC).desktop
 	DESKTOP_FILES += common/usr/share/applications/$(VIDEOPLAYER_EXEC).desktop
-	SYMLINK += common/usr/bin/$(COMPANY_NAME_LOW)
 	DEB_DEPS += common/usr/share/flyfm/templates/desktopeditors.docx.desktop
 	DEB_DEPS += common/usr/share/flyfm/templates/desktopeditors.xlsx.desktop
 	DEB_DEPS += common/usr/share/flyfm/templates/desktopeditors.pptx.desktop
diff --git a/win-linux/package/linux/rpm/common.spec b/win-linux/package/linux/rpm/common.spec
index ba9c62ebe..c332ab839 100644
--- a/win-linux/package/linux/rpm/common.spec
+++ b/win-linux/package/linux/rpm/common.spec
@@ -65,7 +65,6 @@ cp -t $BIN_DIR \
 cp -t $DATA_DIR/applications \
   $COMMON/usr/share/applications/%{_imageviewer_exec}.desktop \
   $COMMON/usr/share/applications/%{_videoplayer_exec}.desktop
-ln -srf $BIN_DIR/%{_desktopeditors_exec} $BIN_DIR/%{_package_name}
 %endif
 
 %clean