From 706a769ebe804b85ec613a1b68b3b3b8444d932f Mon Sep 17 00:00:00 2001 From: Sergey Zhemoytel Date: Fri, 6 Sep 2024 12:01:17 +0000 Subject: [PATCH] 1.3.0 --- rustdesk.spec | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/rustdesk.spec b/rustdesk.spec index 5d08fc3..e4b300b 100644 --- a/rustdesk.spec +++ b/rustdesk.spec @@ -2,6 +2,7 @@ %define debug_package %nil %define rustver 1.79.0 %define vcpkg_ver 2024.07.12 +%define _optdir /opt/%{name} Name: rustdesk Version: 1.3.0 @@ -62,7 +63,7 @@ tar -xf %{SOURCE1} mv vcpkg-%{vcpkg_ver} vcpkg # hardcode ui files -sed -i 's|"file://{}/src/ui/{}"|"file:/%{_datadir}/%{name}/ui/{}"|g' src/ui.rs +#sed -i 's|"file://{}/src/ui/{}"|"file:/%{_datadir}/%{name}/ui/{}"|g' src/ui.rs %build %if %{mdvver} <= 201610 @@ -72,12 +73,15 @@ source "$HOME/.cargo/env" export VCPKG_ROOT=./vcpkg export RUSTFLAGS="-L%{_libdir}" +cargo fix --lib -p scrap --allow-no-vcs + cargo build --release %install -install -d %{buildroot}%{_datadir}/%{name}/files -install -Dm0755 target/release/%{name} %{buildroot}%{_bindir}/%{name} +#install -d %{buildroot}%{_datadir}/%{name}/files +install -d %{buildroot}%{_optdir}/src +install -Dm0755 target/release/%{name} %{buildroot}%{_optdir}/%{name} install -Dm0644 res/rustdesk.service %{buildroot}%{_unitdir}/%{name}.service install -Dm0644 res/rustdesk.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop install -Dm0644 res/rustdesk-link.desktop %{buildroot}%{_datadir}/apprlications/%{name}-link.desktop @@ -87,7 +91,18 @@ install -Dm0644 res/128x128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/%{ install -Dm0644 res/128x128@2x.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/%{name}.png install -Dm0644 res/scalable.svg %{buildroot}%{_iconsdir}/hicolor/scalable/apps/%{name}.svg -cp -a src/ui %{buildroot}%{_datadir}/%{name} +cp -a src/ui %{buildroot}%{_optdir}/src + +# start script +cat > %{buildroot}%{_bindir}/%{name} << EOF +#!/bin/bash +cd /opt/%{name} +./%{name} +EOF + +chmod +x %{buildroot}%{_bindir}/%{name} + + %files %doc README* LICENCE docs @@ -97,6 +112,7 @@ cp -a src/ui %{buildroot}%{_datadir}/%{name} %{_datadir}/apprlications/%{name}-link.desktop %{_iconsdir}/hicolor/*/apps/%{name}.png %{_iconsdir}/hicolor/scalable/apps/%{name}.svg -%{_datadir}/%{name}/ +#{_datadir}/%{name}/ +%{_optdir}