diff --git a/win-linux/package/linux/Makefile b/win-linux/package/linux/Makefile index 4d2ccfa46..527f13e18 100644 --- a/win-linux/package/linux/Makefile +++ b/win-linux/package/linux/Makefile @@ -15,16 +15,17 @@ SCHEME_HANDLER ?= oo-office PRODUCT_VERSION ?= 0.0.0 BUILD_NUMBER ?= 0 -PACKAGE_EDITION ?= opensource BRANDING_DIR ?= . PACKAGE_NAME := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW) -PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER) - +PACKAGE_OPENSOURCE := $(PACKAGE_NAME) +PACKAGE_COMMERCIAL := $(PACKAGE_NAME)-pro +PACKAGE_EDITION ?= opensource ifeq ($(PACKAGE_EDITION), commercial) -PACKAGE_NAME := $(PACKAGE_NAME)-commercial +PACKAGE_NAME := $(PACKAGE_COMMERCIAL) endif +PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER) UNAME_M ?= $(shell uname -m) ifeq ($(UNAME_M),x86_64) @@ -93,6 +94,8 @@ M4_PARAMS += -D M4_PUBLISHER_URL='$(PUBLISHER_URL)' M4_PARAMS += -D M4_SUPPORT_MAIL='$(SUPPORT_MAIL)' M4_PARAMS += -D M4_SUPPORT_URL='$(SUPPORT_URL)' M4_PARAMS += -D M4_PACKAGE_NAME='$(PACKAGE_NAME)' +M4_PARAMS += -D M4_PACKAGE_OPENSOURCE='$(PACKAGE_OPENSOURCE)' +M4_PARAMS += -D M4_PACKAGE_COMMERCIAL='$(PACKAGE_COMMERCIAL)' M4_PARAMS += -D M4_PACKAGE_EDITION='$(PACKAGE_EDITION)' M4_PARAMS += -D M4_DESKTOPEDITORS_PREFIX='$(DESKTOPEDITORS_PREFIX)' M4_PARAMS += -D M4_DESKTOPEDITORS_EXEC='$(DESKTOPEDITORS_EXEC)' @@ -109,6 +112,8 @@ RPM_PARAMS += --define '_publisher_name $(PUBLISHER_NAME)' RPM_PARAMS += --define '_publisher_url $(PUBLISHER_URL)' RPM_PARAMS += --define '_support_mail $(SUPPORT_MAIL)' RPM_PARAMS += --define '_package_name $(PACKAGE_NAME)' +RPM_PARAMS += --define '_package_opensource $(PACKAGE_OPENSOURCE)' +RPM_PARAMS += --define '_package_commercial $(PACKAGE_COMMERCIAL)' RPM_PARAMS += --define '_package_edition $(PACKAGE_EDITION)' RPM_PARAMS += --define '_product_version $(PRODUCT_VERSION)' RPM_PARAMS += --define '_desktopeditors_prefix $(DESKTOPEDITORS_PREFIX)' diff --git a/win-linux/package/linux/common/desktopeditors.desktop.m4 b/win-linux/package/linux/common/desktopeditors.desktop.m4 index 5d00374b7..04eb68f28 100644 --- a/win-linux/package/linux/common/desktopeditors.desktop.m4 +++ b/win-linux/package/linux/common/desktopeditors.desktop.m4 @@ -15,7 +15,7 @@ ifdef('DESKTOPEDITORS[Comment[ru]]',Comment[ru]=defn('DESKTOPEDITORS[Comment[ru] Type=Application Exec=/usr/bin/M4_DESKTOPEDITORS_EXEC %U Terminal=false -Icon=M4_PACKAGE_NAME +Icon=M4_DESKTOPEDITORS_EXEC Keywords=Text;Document;OpenDocument Text;Microsoft Word;Microsoft Works;odt;doc;docx;rtf; Categories=Office;WordProcessor;Spreadsheet;Presentation; MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;text/spreadsheet;application/csv;application/excel;application/x-excel;application/x-msexcel;application/x-ms-excel;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;x-scheme-handler/M4_SCHEME_HANDLER;ifelse(M4_COMPANY_NAME,ONLYOFFICE,application/pdf;) diff --git a/win-linux/package/linux/deb/template/control.m4 b/win-linux/package/linux/deb/template/control.m4 index 09932c699..ac75c716c 100644 --- a/win-linux/package/linux/deb/template/control.m4 +++ b/win-linux/package/linux/deb/template/control.m4 @@ -33,6 +33,7 @@ ifelse(M4_PACKAGE_EDITION, full, Recommends: ttf-mscorefonts-installer, fonts-takao-gothic ifelse(M4_COMPANY_NAME, ONLYOFFICE,Suggests: M4_PACKAGE_NAME-help ,)dnl +Replaces: ifelse(M4_PACKAGE_EDITION, commercial, M4_PACKAGE_OPENSOURCE, M4_PACKAGE_COMMERCIAL) Description: Desktop editors for text docs, spreadsheets, presentations, PDFs, and PDF forms. Open-source office suite pack that comprises all the tools you need to work offline with documents, spreadsheets, presentations, PDFs, and PDF forms. @@ -41,7 +42,6 @@ ifelse(M4_COMPANY_NAME, ONLYOFFICE, Package: M4_PACKAGE_NAME-help Architecture: all Pre-Depends: dpkg (>= 1.14.0) -Depends: - M4_PACKAGE_NAME +Depends: M4_PACKAGE_OPENSOURCE | M4_PACKAGE_COMMERCIAL Description: offline help for M4_COMPANY_NAME M4_PRODUCT_NAME This package contains offline help files.,) diff --git a/win-linux/package/linux/deb/template/copyright.m4 b/win-linux/package/linux/deb/template/copyright.m4 index e351e7d01..8787f5372 100644 --- a/win-linux/package/linux/deb/template/copyright.m4 +++ b/win-linux/package/linux/deb/template/copyright.m4 @@ -5,7 +5,10 @@ Source: M4_PUBLISHER_URL Files: * Copyright: 2016-M4_CURRENT_YEAR, M4_PUBLISHER_NAME -License: AGPL-3.0-only and CC-BY-SA-4.0 +ifelse(M4_PACKAGE_EDITION, commercial, +`License: Proprietary + Placeholder', +`License: AGPL-3.0-only and CC-BY-SA-4.0 This program is a free software product. You can redistribute it and/or modify it under the terms of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software Foundation. In accordance with @@ -28,7 +31,7 @@ License: AGPL-3.0-only and CC-BY-SA-4.0 logo when distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under trademark law for use of our trademarks. . - All the Product's GUI elements, including illustrations and icon sets, as + All the Product''`s GUI elements, including illustrations and icon sets, as well as technical writing content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International. See the License - terms at https://creativecommons.org/licenses/by-sa/4.0/legalcode + terms at https://creativecommons.org/licenses/by-sa/4.0/legalcode') diff --git a/win-linux/package/linux/rpm/common.spec b/win-linux/package/linux/rpm/common.spec index 20c910b66..b424979d0 100644 --- a/win-linux/package/linux/rpm/common.spec +++ b/win-linux/package/linux/rpm/common.spec @@ -2,13 +2,22 @@ Name: %{_package_name} Version: %{_product_version} Release: %{_build_number} Summary: Desktop editors for text docs, spreadsheets, presentations, PDFs, and PDF forms. +%if "%{_package_edition}" == "commercial" +License: Proprietary +%else License: AGPLv3 +%endif Group: Applications/Office URL: %{_publisher_url} Vendor: %{_publisher_name} Packager: %{_publisher_name} %{_support_mail} AutoReq: no AutoProv: no +%if "%{_package_edition}" == "commercial" +Conflicts: %{_package_opensource} +%else +Conflicts: %{_package_commercial} +%endif %description Open-source office suite pack that comprises all the tools you need to @@ -18,7 +27,7 @@ work offline with documents, spreadsheets, presentations, PDFs, and PDF forms. %package help Summary: Offline help for %{_company_name} %{_product_name} BuildArch: noarch -Requires: %{_package_name} +Requires: (%{_package_opensource} or %{_package_commercial}) %description help This package contains offline help files.