pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-02-10 18:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix package name (#1282)

Browse Source
This commit is contained in:
Semyon Bezrukov
2024-07-09 17:03:55 +03:00
parent 24fa1867e6
commit 2821ad6313
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
win-linux/package/linux/Makefile
View File

@ -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_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
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
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

1
win-linux/package/linux/rpm/common.spec
View File

@ -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