[remmina] Enable external tools.

Simone Caronni slaanesh at fedoraproject.org
Fri Jul 18 09:25:19 UTC 2014


commit 416f8371a68b5e9bcf32fa5d0083846b43228beb
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Jul 10 15:40:31 2014 +0200

    Enable external tools.

 remmina.spec |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/remmina.spec b/remmina.spec
index b28c051..82bb0be 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -155,15 +155,18 @@ client.
 # Remove useless tags from desktop file
 sed -i -e '/^OnlyShowIn/d' %{name}/desktop/%{name}.desktop
 
-# Remove external_tools (test scripts)
-sed -i -e '/add_subdirectory(external_tools)/d' %{name}/CMakeLists.txt
+# Do not install tools into user home directory
+sed -i \
+    -e 's@$ENV{HOME}/.%{name}@%{_libexecdir}/%{name}@g' \
+    -e '/^file(MAKE_DIRECTORY/d' \
+    %{name}/external_tools/CMakeLists.txt
+sed -i \
+    -e 's@%s/.%{name}@%{_libexecdir}/%{name}@g' \
+    %{name}/src/%{name}_external_tools.c
 
 %build
 mkdir -p build
 
-CFLAGS="%{optflags} -DLIBVNCSERVER_WITH_CLIENT_TLS=1"
-LDFLAGS="-Wl,-z,relro -Wl,--no-as-needed"
-
 %cmake --build=build \
     -DCMAKE_INSTALL_LIBDIR=%{_lib} \
     -DCMAKE_INSTALL_PREFIX=%{_prefix} \
@@ -262,6 +265,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/*/actions/*.*
 %{_datadir}/icons/hicolor/*/apps/*.*
 %{_datadir}/icons/hicolor/*/emblems/remmina-sftp.png
+%{_libexecdir}/%{name}/
 %dir %{_libdir}/remmina/
 %dir %{_libdir}/remmina/plugins/
 


More information about the scm-commits mailing list