From bc23eb530f78f228e8766e9031c3ccbd72974d70 Mon Sep 17 00:00:00 2001
From: Daniel Tartavel <contact@librepc.com>
Date: Fri, 26 Jun 2020 14:06:11 +0200
Subject: [PATCH] changed x11vnc for vncserver

---
 SOURCES/lalistunnel   |  2 +-
 SOURCES/test.desktop  |  2 +-
 SPECS/task-lalis.spec | 17 ++++++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/SOURCES/lalistunnel b/SOURCES/lalistunnel
index eae1d66..f21f6b7 100755
--- a/SOURCES/lalistunnel
+++ b/SOURCES/lalistunnel
@@ -2,5 +2,5 @@
 
 ssh -i /usr/share/lalis/ssh_id_rsa -p 10022 -N -f -R 6000:localhost:22 ssh@lalis69.ddns.net
 ssh -i /usr/share/lalis/ssh_id_rsa -p 10022 -N -f -R 5900:localhost:5900 ssh@lalis69.ddns.net
-x11vnc -nopw
+vncserver -fg -autokill -noxstartup -SecurityTypes None
 killall ssh
diff --git a/SOURCES/test.desktop b/SOURCES/test.desktop
index 9d5d404..9408f67 100644
--- a/SOURCES/test.desktop
+++ b/SOURCES/test.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment[fr_FR]=Outils de test et d'inventaire matériel de LALIS
 Comment=Outils de test et d'inventaire matériel de LALIS
-Exec=kdesu -u root /usr/local/bin/identMM.pl
+Exec=kdesu -u root /usr/bin/identMM.pl
 GenericName[fr_FR]=Test
 GenericName=Test
 Icon=bleachbit
diff --git a/SPECS/task-lalis.spec b/SPECS/task-lalis.spec
index b74d6cc..b860b39 100755
--- a/SPECS/task-lalis.spec
+++ b/SPECS/task-lalis.spec
@@ -1,7 +1,7 @@
 Summary:	Install LALIS packages and configuration
 Name:		task-lalis
-Version:	5.3
-Release:	%mkrel 6
+Version:	5.4
+Release:	%mkrel 1
 License:	GPLv3
 Group:		Tools
 Url:		http://lalis.fr
@@ -12,7 +12,6 @@ Source3:		Lalis.desktop
 Source4:		identMM.pl
 Source5:		test.desktop
 Source6:		checklist.txt
-#Source7:		simple-scan.mo.patch
 Source8:		ssh_id_rsa
 Source9:		RPM-GPG-KEY-Lalis
 Source10:		lalis-i586.repo
@@ -44,7 +43,7 @@ Requires:		kpat
 Requires:		audiokonverter
 Requires:		tintii
 Requires:		ffmulticonverter
-Requires:		msttcore-fonts-installer
+
 
 %description
 This package installs LALIS choosen packages and some configurations.
@@ -54,7 +53,10 @@ Summary:			Install minimal LALIS packages and configuration
 Group:				Tools
 BuildArch:			noarch
 
+Requires:		msttcore-fonts-installer
 Requires:		sweeper
+Requires:		iotop
+Requires:		htop
 Requires:		vlc-plugin-opengl
 Requires:		vlc-plugin-pulse
 Requires:		vlc-plugin-vdpau
@@ -95,7 +97,6 @@ Requires:		simple-mtpfs
 Requires:		gmtp
 Requires:		qtbluetooth5
 Requires:		pulseaudio-module-bluetooth
-Requires:		krfb
 Requires:		clementine
 Requires:		aspell-fr
 Requires:		transcode
@@ -136,6 +137,7 @@ Requires:		ktorrent
 Requires:		kdeconnect-kde
 Requires:		chromium-browser-stable
 Requires:		nextcloud-client
+Requires:		nextcloud-client-dolphin
 Obsoletes:		task-lalis < 4
 
 %description minimal
@@ -156,7 +158,6 @@ cp %{SOURCE3} %{buildroot}%{_datadir}/dist/desktop-files/default/
 cp %{SOURCE5} %{buildroot}%{_datadir}/dist/desktop-files/default/
 cp %{SOURCE1} %{buildroot}%{_datadir}/lalis/
 cp %{SOURCE6} %{buildroot}%{_datadir}/lalis/
-#cp %{SOURCE7} %{buildroot}%{_datadir}/lalis/
 cp %{SOURCE8} %{buildroot}%{_datadir}/lalis/
 cp %{SOURCE9} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 cp %{SOURCE10} %{buildroot}%{_sysconfdir}/yum.repos.d/
@@ -213,6 +214,7 @@ if [ -z "`grep lalis /etc/ssh/sshd_config`" ]; then
 	fi
 fi
 /usr/bin/systemctl restart sshd
+
 # Ajoute le fichier test.desktop sur le bureau de l'utilisateur lalis
 desktop /home/lalis
 echo $DESKTOP
@@ -227,7 +229,7 @@ chown lalis:lalis -R /home/lalis/$DESKTOP/test.desktop
 # Copie le fichier Lalis.desktop dans le dossier /etc/skel
 cp -f /usr/share/kio_desktop/Lalis.desktop /etc/skel/$DESKTOP
 
-# Copie le fichier Lalis.desktop dans les dossier utilisateurs existant
+# Copie le fichier Lalis.desktop sur le bureau des utilisateurs existant
 cp -f /usr/share/kio_desktop/Lalis.desktop /usr/share/dist/desktop-files/default/
 for i in /home/*
 do
@@ -260,6 +262,7 @@ fi
 ARCH=`uname -i`
 U=`uname -r`
 MGAVERSION=${U##*.mga}
+
 #adding lalis mirror
 grep -q 'lalis rsync://lalis69.ddns.net:10073/mageia/lalis/' /etc/urpmi/urpmi.cfg
 if [ ${?} -ne 0 ]; then