From bb726e6deb7970ab757db2f80745135b415a54c0 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Wed, 10 May 2017 15:25:21 +0100 Subject: [PATCH 01/10] #4132 Disable Qt Bearer management --- src/gui/src/main.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gui/src/main.cpp b/src/gui/src/main.cpp index cf4d0c1e..fe09ed3e 100644 --- a/src/gui/src/main.cpp +++ b/src/gui/src/main.cpp @@ -32,7 +32,10 @@ #if defined(Q_OS_MAC) #include +#endif +#ifdef Q_OS_DARWIN +#include #endif class QThreadImpl : public QThread @@ -52,6 +55,10 @@ bool checkMacAssistiveDevices(); int main(int argc, char* argv[]) { +#ifdef Q_OS_DARWIN + /* Workaround for QTBUG-40332 - "High ping when QNetworkAccessManager is instantiated" */ + ::setenv ("QT_BEARER_POLL_TIMEOUT", "-1", 1); +#endif QCoreApplication::setOrganizationName("Synergy"); QCoreApplication::setOrganizationDomain("http://symless.com/"); QCoreApplication::setApplicationName("Synergy"); From 526fe3d4534d25c549945da782e82c9271e0b0c8 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Wed, 10 May 2017 15:28:01 +0100 Subject: [PATCH 02/10] Update ChangeLog --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0882fd01..c7577357 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +v1.9.0-beta3 +============ +Bug #4132 - Laggy mouse cursor on macOS clients + v1.9.0-beta2 =========== Bug #5901 - Stored serial key corrupted on macOS From f987381a0f419e11dd8ccc7ab65677339efb218a Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Wed, 10 May 2017 15:29:48 +0100 Subject: [PATCH 03/10] Make ready v1.9.0-rc3 --- Build.properties | 2 +- ChangeLog | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Build.properties b/Build.properties index 96071ca4..2e163462 100644 --- a/Build.properties +++ b/Build.properties @@ -4,4 +4,4 @@ SYNERGY_VERSION_MAJOR = 1 SYNERGY_VERSION_MINOR = 9 SYNERGY_VERSION_PATCH = 0 -SYNERGY_VERSION_STAGE = beta2 +SYNERGY_VERSION_STAGE = rc3 diff --git a/ChangeLog b/ChangeLog index c7577357..aace2ff3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,13 @@ -v1.9.0-beta3 +v1.9.0-rc3 ============ Bug #4132 - Laggy mouse cursor on macOS clients -v1.9.0-beta2 +v1.9.0-rc2 =========== Bug #5901 - Stored serial key corrupted on macOS Bug #5757 - Failure to build against OpenSSL v1.1.0 -v1.9.0-beta1 +v1.9.0-rc1 ========== Bug #5467 - Failing to automatically download and install Bonjour Enhancement #5389 - Ported GUI to Qt 5 From 1c5e986dcf6b74e010c6af20af5a35f8cb438849 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Thu, 11 May 2017 21:18:29 +0100 Subject: [PATCH 04/10] QtQuick isn't a required dependency --- debian/control | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 775a4b64..a1a79b2b 100644 --- a/debian/control +++ b/debian/control @@ -10,11 +10,7 @@ Architecture: amd64 Section: utils Priority: optional Depends: ${shlibs:Depends}, - ${misc:Depends}, - qml-module-qtquick-controls (>= 5.0.2), - qml-module-qtquick-layouts (>= 5.0.2), - qml-module-qtquick-dialogs (>= 5.0.2), - qml-module-qtquick2 (>= 5.0.2) + ${misc:Depends} Description: Keyboard and mouse sharing solution Synergy allows you to share one mouse and keyboard between multiple computers. Work seamlessly across Windows, macOS and Linux. From b52eb95f417eafdba0d20f8835a352a2d27c764c Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Sun, 21 May 2017 23:29:25 +0100 Subject: [PATCH 05/10] Tweak version handling again --- Build.properties | 2 +- CMakeLists.txt | 35 +++++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Build.properties b/Build.properties index 2e163462..2aaa42d5 100644 --- a/Build.properties +++ b/Build.properties @@ -4,4 +4,4 @@ SYNERGY_VERSION_MAJOR = 1 SYNERGY_VERSION_MINOR = 9 SYNERGY_VERSION_PATCH = 0 -SYNERGY_VERSION_STAGE = rc3 +SYNERGY_VERSION_STAGE = git diff --git a/CMakeLists.txt b/CMakeLists.txt index 3afd4521..5501f393 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,9 +17,9 @@ cmake_minimum_required (VERSION 3.4) project (synergy C CXX) -option (SYNERGY_BUILD_LEGACY_GUI "Build the legacy GUI (synergy)" ON) +option (SYNERGY_BUILD_LEGACY_GUI "Build the legacy GUI" ON) option (SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON) -option (SYNERGY_BUILD_LEGACY_INSTALLER "Build the installer" ON) +option (SYNERGY_BUILD_LEGACY_INSTALLER "Build the legacy installer" ON) set (CMAKE_CXX_STANDARD 14) set (CMAKE_CXX_EXTENSIONS OFF) @@ -34,14 +34,13 @@ endif() # # Version # -# NOTE: We follow 'Semantic Versioning' now: http://semver.org/ - if (NOT DEFINED SYNERGY_VERSION_MAJOR) if (DEFINED ENV{SYNERGY_VERSION_MAJOR}) set (SYNERGY_VERSION_MAJOR $ENV{SYNERGY_VERSION_MAJOR}) else() set (SYNERGY_VERSION_MAJOR 1) - message (WARNING "SYNERGY_VERSION_MAJOR not set. Defaulted to ${SYNERGY_VERSION_MAJOR}") + message (WARNING + "SYNERGY_VERSION_MAJOR not set. Defaulted to ${SYNERGY_VERSION_MAJOR}") endif() endif() @@ -50,7 +49,8 @@ if (NOT DEFINED SYNERGY_VERSION_MINOR) set (SYNERGY_VERSION_MINOR $ENV{SYNERGY_VERSION_MINOR}) else() set (SYNERGY_VERSION_MINOR 9) - message (WARNING "(SYNERGY_VERSION_MINOR not set. Defaulted to ${SYNERGY_VERSION_MINOR}") + message (WARNING + "(SYNERGY_VERSION_MINOR not set. Defaulted to ${SYNERGY_VERSION_MINOR}") endif() endif() @@ -59,7 +59,8 @@ if (NOT DEFINED SYNERGY_VERSION_PATCH) set (SYNERGY_VERSION_PATCH $ENV{SYNERGY_VERSION_PATCH}) else() set (SYNERGY_VERSION_PATCH 0) - message (WARNING "SYNERGY_VERSION_PATCH not set. Defaulted to ${SYNERGY_VERSION_PATCH}") + message (WARNING + "SYNERGY_VERSION_PATCH not set. Defaulted to ${SYNERGY_VERSION_PATCH}") endif() endif() @@ -68,15 +69,29 @@ if (NOT DEFINED SYNERGY_VERSION_STAGE) set (SYNERGY_VERSION_STAGE $ENV{SYNERGY_VERSION_STAGE}) else() set (SYNERGY_VERSION_STAGE "git") - message (WARNING "SYNERGY_VERSION_STAGE not set. Defaulted to ${SYNERGY_VERSION_STAGE}") + message (WARNING "SYNERGY_VERSION_STAGE not set. Defaulted to '${SYNERGY_VERSION_STAGE}'") endif() endif() -if ((NOT DEFINED SYNERGY_REVISION) AND (DEFINED ENV{SYNERGY_REVISION})) - set (SYNERGY_REVISION $ENV{SYNERGY_REVISION}) +if (NOT DEFINED SYNERGY_REVISION) + if (DEFINED ENV{GIT_COMMIT}) + string (SUBSTRING $ENV{GIT_COMMIT} 0 7 SYNERGY_REVISION) + endif() +endif() + +if (SYNERGY_VERSION_STAGE STREQUAL "git") + if (NOT DEFINED SYNERGY_REVISION) + message (FATAL_ERROR "Either SYNERGY_REVISION or SYNERGY_VERSION_STAGE must be set.") + endif() + set (SYNERGY_VERSION_TAG "g${SYNERGY_REVISION}") +else() + set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}") endif() set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}") +set (SYNERGY_VERSION_STRING "${SYNERGY_VERSION}-${SYNERGY_VERSION_TAG}") +message (STATUS "Full Synergy version string is " ${SYNERGY_VERSION_STRING}) + # TODO: Find out why we need these, and remove them if (COMMAND cmake_policy) From 0f137543e4c36ea98cdbfb1aef43b05a2756480f Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Mon, 22 May 2017 09:52:27 +0100 Subject: [PATCH 06/10] Generate useful release tag in RPM specfile --- CMakeLists.txt | 30 +++++++++++++++++++++++------- dist/rpm/synergy.spec.in | 2 +- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5501f393..c3bba45b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,23 +76,39 @@ endif() if (NOT DEFINED SYNERGY_REVISION) if (DEFINED ENV{GIT_COMMIT}) string (SUBSTRING $ENV{GIT_COMMIT} 0 7 SYNERGY_REVISION) + elseif (SYNERGY_VERSION_STAGE STREQUAL "git") + execute_process ( + COMMAND git rev-parse --short HEAD + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE SYNERGY_REVISION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) endif() endif() +#if (NOT "${SYNERGY_REVISION}" MATCHES "[a-f0-9]{8}") +# message (FATAL_ERROR "SYNERGY_VERSION='${SYNERGY_REVISION}' is an invalid git shorthash") +#endif() + +string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) +if (DEFINED ENV{BUILD_NUMBER}) + set (SYNERGY_BUILD_NUMBER $ENV{BUILD_NUMBER}}) +else() + set (SYNERGY_BUILD_NUMBER 1) +endif() + +set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}") +set (SYNERGY_SNAPSHOT_INFO "${SYNERGY_BUILD_DATE}.${SYNERGY_REVISION}") + if (SYNERGY_VERSION_STAGE STREQUAL "git") - if (NOT DEFINED SYNERGY_REVISION) - message (FATAL_ERROR "Either SYNERGY_REVISION or SYNERGY_VERSION_STAGE must be set.") - endif() - set (SYNERGY_VERSION_TAG "g${SYNERGY_REVISION}") + set (SYNERGY_VERSION_TAG "b${SYNERGY_BUILD_NUMBER}.${SYNERGY_SNAPSHOT_INFO}") else() set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}") endif() -set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}") set (SYNERGY_VERSION_STRING "${SYNERGY_VERSION}-${SYNERGY_VERSION_TAG}") message (STATUS "Full Synergy version string is " ${SYNERGY_VERSION_STRING}) - # TODO: Find out why we need these, and remove them if (COMMAND cmake_policy) cmake_policy (SET CMP0003 NEW) @@ -430,6 +446,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") endif() else() - message (STATUS "NOT configuring the v1 installer") + message (STATUS "NOT configuring the v1 installer") endif() add_subdirectory (src) diff --git a/dist/rpm/synergy.spec.in b/dist/rpm/synergy.spec.in index e543a12e..254475c8 100644 --- a/dist/rpm/synergy.spec.in +++ b/dist/rpm/synergy.spec.in @@ -7,7 +7,7 @@ Source: https://symless.com/synergy/downloads Vendor: Symless Packager: Symless License: GPLv2 -Release: 1 +Release: @SYNERGY_BUILD_NUMBER@.@SYNERGY_SNAPSHOT_INFO@%{?dist} %description Synergy allows you to share one mouse and keyboard between multiple computers. From e041af6010908ab7fa4cb734841304d9de1640fe Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Mon, 22 May 2017 11:09:58 +0100 Subject: [PATCH 07/10] Add support for BUILDS_TODAY to CMake --- CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3bba45b..964a3876 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,8 +91,14 @@ endif() #endif() string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) +if (DEFINED ENV{BUILDS_TODAY}) + set (SYNERGY_BUILDS_TODAY $ENV{BUILDS_TODAY}) +else() + set (SYNERGY_BUILDS_TODAY 1) +endif() + if (DEFINED ENV{BUILD_NUMBER}) - set (SYNERGY_BUILD_NUMBER $ENV{BUILD_NUMBER}}) + set (SYNERGY_BUILD_NUMBER $ENV{BUILD_NUMBER}) else() set (SYNERGY_BUILD_NUMBER 1) endif() @@ -101,7 +107,7 @@ set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERG set (SYNERGY_SNAPSHOT_INFO "${SYNERGY_BUILD_DATE}.${SYNERGY_REVISION}") if (SYNERGY_VERSION_STAGE STREQUAL "git") - set (SYNERGY_VERSION_TAG "b${SYNERGY_BUILD_NUMBER}.${SYNERGY_SNAPSHOT_INFO}") + set (SYNERGY_VERSION_TAG "${SYNERGY_SNAPSHOT_INFO}") else() set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}") endif() From 9d79f9bee468e0f987e45d51f3f39d19619eafd0 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Mon, 22 May 2017 11:10:29 +0100 Subject: [PATCH 08/10] Update RPM spec to use BUILDS_TODAY --- dist/rpm/synergy.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/rpm/synergy.spec.in b/dist/rpm/synergy.spec.in index 254475c8..e876c001 100644 --- a/dist/rpm/synergy.spec.in +++ b/dist/rpm/synergy.spec.in @@ -7,7 +7,7 @@ Source: https://symless.com/synergy/downloads Vendor: Symless Packager: Symless License: GPLv2 -Release: @SYNERGY_BUILD_NUMBER@.@SYNERGY_SNAPSHOT_INFO@%{?dist} +Release: @SYNERGY_BUILDS_TODAY@.@SYNERGY_SNAPSHOT_INFO@%{?dist} %description Synergy allows you to share one mouse and keyboard between multiple computers. From ca830f267a2fa1ae8dd7698e94f65dfa890b5054 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Mon, 22 May 2017 14:30:12 +0100 Subject: [PATCH 09/10] Use 8 characters for SYNERGY_REVISION --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 964a3876..7cc775a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ endif() if (NOT DEFINED SYNERGY_REVISION) if (DEFINED ENV{GIT_COMMIT}) - string (SUBSTRING $ENV{GIT_COMMIT} 0 7 SYNERGY_REVISION) + string (SUBSTRING $ENV{GIT_COMMIT} 0 8 SYNERGY_REVISION) elseif (SYNERGY_VERSION_STAGE STREQUAL "git") execute_process ( COMMAND git rev-parse --short HEAD @@ -86,9 +86,9 @@ if (NOT DEFINED SYNERGY_REVISION) endif() endif() -#if (NOT "${SYNERGY_REVISION}" MATCHES "[a-f0-9]{8}") -# message (FATAL_ERROR "SYNERGY_VERSION='${SYNERGY_REVISION}' is an invalid git shorthash") -#endif() +if (NOT SYNERGY_REVISION MATCHES "[a-f0-9]{8}") + message (FATAL_ERROR "SYNERGY_VERSION='${SYNERGY_REVISION}' is invalid") +endif() string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) if (DEFINED ENV{BUILDS_TODAY}) From 8d92b7ad45f4125e491da8da2f763b20fab73fe6 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Mon, 22 May 2017 15:48:39 +0100 Subject: [PATCH 10/10] More CMake version number tweaking --- CMakeLists.txt | 49 +++++++++++++++++++++++----------------- dist/rpm/synergy.spec.in | 2 +- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cc775a7..3d1aa8bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,8 @@ if (NOT DEFINED SYNERGY_VERSION_MAJOR) set (SYNERGY_VERSION_MAJOR $ENV{SYNERGY_VERSION_MAJOR}) else() set (SYNERGY_VERSION_MAJOR 1) - message (WARNING - "SYNERGY_VERSION_MAJOR not set. Defaulted to ${SYNERGY_VERSION_MAJOR}") + set (SYNERGY_VERSION_WARNED 1) + message (WARNING "SYNERGY_VERSION_MAJOR not set. Defaulted to ${SYNERGY_VERSION_MAJOR}") endif() endif() @@ -49,8 +49,10 @@ if (NOT DEFINED SYNERGY_VERSION_MINOR) set (SYNERGY_VERSION_MINOR $ENV{SYNERGY_VERSION_MINOR}) else() set (SYNERGY_VERSION_MINOR 9) - message (WARNING - "(SYNERGY_VERSION_MINOR not set. Defaulted to ${SYNERGY_VERSION_MINOR}") + if (NOT ${SYNERGY_VERSION_WARNED}) + set (SYNERGY_VERSION_WARNED 1) + message (WARNING "(SYNERGY_VERSION_MINOR not set. Defaulted to ${SYNERGY_VERSION_MINOR}") + endif() endif() endif() @@ -59,8 +61,10 @@ if (NOT DEFINED SYNERGY_VERSION_PATCH) set (SYNERGY_VERSION_PATCH $ENV{SYNERGY_VERSION_PATCH}) else() set (SYNERGY_VERSION_PATCH 0) - message (WARNING - "SYNERGY_VERSION_PATCH not set. Defaulted to ${SYNERGY_VERSION_PATCH}") + if (NOT ${SYNERGY_VERSION_WARNED}) + set (SYNERGY_VERSION_WARNED 1) + message (WARNING "SYNERGY_VERSION_PATCH not set. Defaulted to ${SYNERGY_VERSION_PATCH}") + endif() endif() endif() @@ -69,7 +73,10 @@ if (NOT DEFINED SYNERGY_VERSION_STAGE) set (SYNERGY_VERSION_STAGE $ENV{SYNERGY_VERSION_STAGE}) else() set (SYNERGY_VERSION_STAGE "git") - message (WARNING "SYNERGY_VERSION_STAGE not set. Defaulted to '${SYNERGY_VERSION_STAGE}'") + if (NOT ${SYNERGY_VERSION_WARNED}) + set (SYNERGY_VERSION_WARNED 1) + message (WARNING "SYNERGY_VERSION_STAGE not set. Defaulted to '${SYNERGY_VERSION_STAGE}'") + endif() endif() endif() @@ -78,7 +85,7 @@ if (NOT DEFINED SYNERGY_REVISION) string (SUBSTRING $ENV{GIT_COMMIT} 0 8 SYNERGY_REVISION) elseif (SYNERGY_VERSION_STAGE STREQUAL "git") execute_process ( - COMMAND git rev-parse --short HEAD + COMMAND git rev-parse --short=8 HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE SYNERGY_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE @@ -86,32 +93,32 @@ if (NOT DEFINED SYNERGY_REVISION) endif() endif() -if (NOT SYNERGY_REVISION MATCHES "[a-f0-9]{8}") - message (FATAL_ERROR "SYNERGY_VERSION='${SYNERGY_REVISION}' is invalid") -endif() - -string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) -if (DEFINED ENV{BUILDS_TODAY}) - set (SYNERGY_BUILDS_TODAY $ENV{BUILDS_TODAY}) +if (DEFINED SYNERGY_REVISION) + string(LENGTH ${SYNERGY_REVISION} SYNERGY_REVISION_LENGTH) + if (NOT ((SYNERGY_REVISION MATCHES "^[a-f0-9]+") AND (SYNERGY_REVISION_LENGTH EQUAL "8"))) + message (FATAL_ERROR "SYNERGY_REVISION='${SYNERGY_REVISION}' should be a short git commit hash") + endif() + unset (SYNERGY_REVISION_LENGTH) else() - set (SYNERGY_BUILDS_TODAY 1) -endif() +endif() if (DEFINED ENV{BUILD_NUMBER}) set (SYNERGY_BUILD_NUMBER $ENV{BUILD_NUMBER}) else() set (SYNERGY_BUILD_NUMBER 1) endif() -set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}") -set (SYNERGY_SNAPSHOT_INFO "${SYNERGY_BUILD_DATE}.${SYNERGY_REVISION}") +string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) if (SYNERGY_VERSION_STAGE STREQUAL "git") - set (SYNERGY_VERSION_TAG "${SYNERGY_SNAPSHOT_INFO}") + set (SYNERGY_SNAPSHOT_INFO "${SYNERGY_BUILD_DATE}.${SYNERGY_REVISION}") + set (SYNERGY_VERSION_TAG "b${SYNERGY_BUILD_DATE}-${SYNERGY_REVISION}") else() + set (SYNERGY_SNAPSHOT_INFO "") set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}") endif() +set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}") set (SYNERGY_VERSION_STRING "${SYNERGY_VERSION}-${SYNERGY_VERSION_TAG}") message (STATUS "Full Synergy version string is " ${SYNERGY_VERSION_STRING}) @@ -452,6 +459,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") endif() else() - message (STATUS "NOT configuring the v1 installer") + message (STATUS "NOT configuring the v1 installer") endif() add_subdirectory (src) diff --git a/dist/rpm/synergy.spec.in b/dist/rpm/synergy.spec.in index e876c001..254475c8 100644 --- a/dist/rpm/synergy.spec.in +++ b/dist/rpm/synergy.spec.in @@ -7,7 +7,7 @@ Source: https://symless.com/synergy/downloads Vendor: Symless Packager: Symless License: GPLv2 -Release: @SYNERGY_BUILDS_TODAY@.@SYNERGY_SNAPSHOT_INFO@%{?dist} +Release: @SYNERGY_BUILD_NUMBER@.@SYNERGY_SNAPSHOT_INFO@%{?dist} %description Synergy allows you to share one mouse and keyboard between multiple computers.