From 120040f8d468da31987155eddae880ad02ac3f700ffc5d5d86919839dfef12a6 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 7 Feb 2019 12:37:19 +0000 Subject: [PATCH] Accepting request 672439 from home:coolo:branches:X11:XOrg Important fix for Staging:E - Fix build with latest cmake - which now requires the source directory as argument (still works with old cmake versions) OBS-URL: https://build.opensuse.org/request/show/672439 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=156 --- tigervnc.changes | 6 ++++++ tigervnc.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tigervnc.changes b/tigervnc.changes index 4403a6c..292699d 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 7 12:34:03 UTC 2019 - Stephan Kulow + +- Fix build with latest cmake - which now requires the source + directory as argument (still works with old cmake versions) + ------------------------------------------------------------------- Thu Jan 17 12:07:27 UTC 2019 - msrb@suse.com diff --git a/tigervnc.spec b/tigervnc.spec index ef77650..0971d4b 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -266,7 +266,7 @@ popd export CXXFLAGS="%optflags" export CFLAGS="%optflags" # Build all tigervnc -cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo +cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo . make %{?_smp_mflags} # Build Xvnc server @@ -295,7 +295,7 @@ popd # Build java client pushd java -cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DJAVACFLAGS="-encoding utf8 -source 1.6 -target 1.6" +cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DJAVACFLAGS="-encoding utf8 -source 1.6 -target 1.6" . make %{?_smp_mflags} popd