#1 Fixes RHBZ#1541640
Merged 6 years ago by dchen. Opened 6 years ago by dchen.

file modified
+28 -18
@@ -1,17 +1,22 @@ 

  %global synergy_revision 0bd448d5

+ %global gui_version 1.8.8

+ %global gui_base_dir %{name}-core-%{gui_version}-stable

  Summary: Share mouse and keyboard between multiple computers over the network

  Name: synergy

  Version: 2.0.0

- Release: 1%{?dist}

+ Release: 2%{?dist}

  License: GPLv2

  Group: System Environment/Daemons

  URL: https://symless.com/synergy

- Source: https://github.com/symless/synergy-core/archive/v%{version}-stable.tar.gz

+ Source0: https://github.com/symless/synergy-core/archive/v%{version}-stable.tar.gz

+ # Revive GUI

+ Source1: https://github.com/symless/synergy-core/archive/v%{gui_version}-stable.tar.gz

  

  # Last built version of synergy-plus was 1.3.4-12.fc20

  Provides: synergy-plus = %{version}-%{release}

  Obsoletes: synergy-plus < 1.3.4-13

  BuildRequires: cmake3

+ BuildRequires: avahi-compat-libdns_sd-devel

  BuildRequires: libX11-devel

  BuildRequires: libXtst-devel

  BuildRequires: qt-devel
@@ -29,6 +34,15 @@ 

  %prep

  %setup -q -n %{name}-core-%{version}-stable

  rm -fr ext/openssl

+ 

+ ## Revive GUI

+ tar xzvf %{SOURCE1}

+ ## v2.0 does not support option --no-tray

+ sed -i.no-tray -e 's/<< "--no-tray"//g' %{gui_base_dir}/src/gui/src/MainWindow.cpp

+ rm -fr %{gui_base_dir}/ext/cryptopp562.zip

+ rm -fr %{gui_base_dir}/src/test

+ 

+ 

  #Disable tests for now (bundled gmock/gtest)

  #sed -i /.*\(test.*/d src/CMakeLists.txt

  
@@ -36,10 +50,15 @@ 

  PATH="$PATH:/usr/lib64/qt4/bin:/usr/lib/qt4/bin"

  %{cmake3} -DSYNERGY_VERSION_STAGE:STRING=stable -DSYNERGY_REVISION:STRING=%{synergy_revision} .

  make %{?_smp_mflags}

+ cd %{gui_base_dir}/src/gui

+ %qmake_qt4 gui.pro -r

+ make %{?_smp_mflags}

+ cd -

  

- ln -s synergy-core bin/synergy

  

  %install

+ install -D -p -m 0755 %{gui_base_dir}/bin/synergy      %{buildroot}%{_bindir}/synergy

+ install -D -p -m 0644 %{gui_base_dir}/res/synergy.desktop %{buildroot}%{_datadir}/applications/synergy.desktop

  install -D -p -m 0755 bin/synergyc     %{buildroot}%{_bindir}/synergyc

  install -D -p -m 0755 bin/synergys     %{buildroot}%{_bindir}/synergys

  install -D -p -m 0755 bin/synergy-core %{buildroot}%{_bindir}/synergy-core
@@ -48,20 +67,6 @@ 

  install -D -p -m 0644 res/synergy.ico  %{buildroot}%{_datadir}/pixmaps/synergy.ico

  

  cd %{buildroot}%{_bindir}

- ln -s synergy-core synergy

- 

- mkdir -p %{buildroot}%{_datadir}/applications

- ## Write .desktop

- cat <<END> %{buildroot}%{_datadir}/applications/%{name}.desktop

- [Desktop Entry]

- Name=Synergy

- Comment=Share your keyboard and mouse over a network

- Exec=synergy-core

- Icon=/usr/share/pixmaps/synergy.ico

- Type=Application

- Categories=Utility;

- X-Desktop-File-Install-Version=0.23

- END

  

  mkdir -p %{buildroot}%{_datadir}/metainfo

  ## Write AppStream
@@ -123,10 +128,15 @@ 

  %{_mandir}/man8/synergys.8*

  

  %changelog

+ * Tue Feb 06 2018 Ding-Yi Chen <dchen@redhat.com> - 2.0.0-2

+ - Restore Program /usr/bin/synergy

+ - Fixes Bug 1542286 synergy-2.0.0 should not have been pushed anywhere except rawhide

+ - Fixes Bug 1541640 - synergy.desktop file useless

+ 

  * Wed Jan 17 2018 Ding-Yi Chen <dchen@redhat.com> - 2.0.0-1

  - Update to 2.0.0

  - Fixes Bug 1476515 - AppStream metadata for Synergy package are missing

- - The real executable is now "synergy-core", 

+ - The real executable is now "synergy-core",

    "synergy" is now a symlink to synergy-core

  - cmake3 is now BuildRequired

  - syntool is removed by upstream

Fixes Bug 1541640 - synergy.desktop file useless https://bugzilla.redhat.com/show_bug.cgi?id=1541640
Fixes Bug 1542286 - synergy-2.0.0 should not have been pushed anywhere except rawhide https://bugzilla.redhat.com/show_bug.cgi?id=1542286

Pull-Request has been merged by dchen

6 years ago