From 3efc7122049b7f371105182af29d1cffba26f96a Mon Sep 17 00:00:00 2001
From: David Kaufmann <astra@ionic.at>
Date: Dec 07 2020 02:42:21 +0000
Subject: upgrade to v1.12.0


---

diff --git a/.gitignore b/.gitignore
index f411a0d..7f47a92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /v2.0.0-stable.tar.gz
 /v1.10.2-stable.tar.gz
 /v1.11.1-stable.tar.gz
+/v1.12.0-stable.tar.gz
diff --git a/sources b/sources
index 40f5ac4..d48969b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.11.1-stable.tar.gz) = 54c84596c543eb799ba9244f100d67045b159ec5ef622375fb5b763144b211833999c05f6d5dae42086e28a90b3a87a9d3fc7d7469d4d900f2e4ad9b9a48e0a2
+SHA512 (v1.12.0-stable.tar.gz) = 234e8eb42624f006aa45dfcf50a80089a82347c7151da040f10066b412f729adf01600bc9ec2274a0941965e91ab7bab74abd398287a20906dd4a70b1948db5a
diff --git a/synergy-1.12.0-disable-bundled-gtest.patch b/synergy-1.12.0-disable-bundled-gtest.patch
new file mode 100644
index 0000000..d7fc40d
--- /dev/null
+++ b/synergy-1.12.0-disable-bundled-gtest.patch
@@ -0,0 +1,58 @@
+--- synergy-core-1.12.0-stable/CMakeLists.txt.orig	2020-12-07 02:58:12.461352105 +0100
++++ synergy-core-1.12.0-stable/CMakeLists.txt	2020-12-07 03:01:26.747583111 +0100
+@@ -59,7 +59,6 @@
+ 
+ 
+ set (libs)
+-include_directories (BEFORE SYSTEM ${PROJECT_SOURCE_DIR}/ext/googletest/googletest/include)
+ 
+ if (UNIX)
+     if (NOT APPLE)
+@@ -332,13 +331,6 @@
+   endif()
+ endif()
+ 
+-#
+-# Google Test
+-#
+-if(NOT EXISTS "${PROJECT_SOURCE_DIR}/ext/googletest/CMakeLists.txt")
+-  message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.")
+-endif()
+-
+ 
+ #
+ # Configure_file... but for directories, recursively.
+--- synergy-core-1.12.0-stable/src/test/CMakeLists.txt.orig	2020-12-07 03:07:58.073991685 +0100
++++ synergy-core-1.12.0-stable/src/test/CMakeLists.txt	2020-12-07 03:30:25.846824267 +0100
+@@ -14,20 +14,5 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-include_directories(
+-    ../../ext/googletest/googletest
+-    ../../ext/googletest/googletest/include
+-    ../../ext/googletest/googlemock
+-    ../../ext/googletest/googlemock/include)
+-    
+-add_library(gtest STATIC ../../ext/googletest/googletest/src/gtest-all.cc)
+-add_library(gmock STATIC ../../ext/googletest/googlemock/src/gmock-all.cc)
+-
+-if (UNIX)
+-    # ignore warnings in gtest and gmock
+-    set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
+-    set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
+-endif()
+-
+ add_subdirectory(integtests)
+ add_subdirectory(unittests)
+--- synergy-core-1.12.0-stable/src/test/integtests/CMakeLists.txt.orig	2020-12-07 03:09:04.596701200 +0100
++++ synergy-core-1.12.0-stable/src/test/integtests/CMakeLists.txt	2020-12-07 03:09:26.300280166 +0100
+@@ -56,8 +56,6 @@
+ include_directories(
+     ../../
+     ../../lib/
+-    ../../../ext/googletest/googletest/include
+-    ../../../ext/googletest/googlemock/include
+ )
+ 
+ if (UNIX)
diff --git a/synergy.spec b/synergy.spec
index 680567a..03fdd4b 100644
--- a/synergy.spec
+++ b/synergy.spec
@@ -5,11 +5,12 @@
 Summary: Share mouse and keyboard between multiple computers over the network
 Name: synergy
 Epoch: 1
-Version: 1.11.1
-Release: 4%{?dist}
+Version: 1.12.0
+Release: 1%{?dist}
 License: GPLv2
 URL: https://symless.com/synergy
 Source0: https://github.com/symless/synergy-core/archive/v%{version}-stable.tar.gz
+Patch0: synergy-1.12.0-disable-bundled-gtest.patch
 
 # Last built version of synergy-plus was 1.3.4-12.fc20
 Provides: synergy-plus = %{version}-%{release}
@@ -19,11 +20,15 @@ BuildRequires: avahi-compat-libdns_sd-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gcc-c++
 BuildRequires: libXtst-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXrandr-devel
 BuildRequires: openssl-devel
 BuildRequires: qt5-qtbase-devel
 BuildRequires: qt5-linguist
 #BuildRequires: libcurl-devel
 #BuildRequires: desktop-file-utils
+BuildRequires: gtest-devel
+BuildRequires: gmock-devel
 Requires: qt5-qtbase
 
 
@@ -36,6 +41,7 @@ as moving the mouse off the edge of your screen.
 
 %prep
 %setup -q -n %{name}-core-%{version}-stable
+%patch0 -p1
 #rm -fr ext/openssl
 
 #Disable tests for now (bundled gmock/gtest)
@@ -115,6 +121,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/synergy.desktop
 %{_mandir}/man8/synergys.8.gz
 
 %changelog
+* Mon Dec 07 2020 David Kaufmann <astra@ionic.at> - 1:1.12.0-1
+- Upstream update to v1.12.0-stable
+
 * Tue Sep 22 2020 Jeff Law <law@redhat.com> - 1:1.11.1-4
 - Use cmake_in_source_build to fix FTBFS due to recent cmake macro changes