séparation en task-lalis-minimal et task-lalis

SPECS/task-lalis.spec

@@ -1,11 +1,7 @@
-
-
-
-
 Summary:	Install LALIS packages and configuration
 Name:		task-lalis
-Version:	3.3
+Version:	4
-Release:	%mkrel 1
+Release:	1
 License:	GPLv3
 Group:		Tools
 Url:		http://lalis.fr
@@ -17,17 +13,12 @@ Source4:		identMM.pl
 Source5:		test.desktop
 Source6:		checklist.txt
 Source7:		simple-scan.mo.patch
-Requires:		kate
+
-Requires:		openssh-server
-Requires:		sshfs-fuse
 Requires:		celestia
 Requires:		kstars
 Requires:		stellarium
-Requires:		ssmtp
-Requires:		kwallet-pam
 Requires:		tuxpaint
 Requires:		avidemux-qt-plugins
-Requires:		kpdftool
 Requires:		gcompris-qt
 Requires:		kgpg
 Requires:		xsane
@@ -36,23 +27,25 @@ Requires:		kstars
 Requires:		stellarium
 Requires:		gnuplot
 Requires:		drgeo
-Requires:		evince
-Requires:		audacity
-Requires:		kdenlive
-Requires:		spamassassin
-Requires:		p7zip
-Requires:		unrar
 Requires:		kaudiocreator
-Requires:		ark
-Requires:		kim4
-Requires:		krename
 Requires:		gimp-resynthesizer
 Requires:		gimp-data-extras
 Requires:		gimp-plugin-gmic
-Requires:		ktorrent
-Requires:		lame
 Requires:		pidgin
 Requires:		empathy
+Requires:		kpat
+Requires:		audiokonverter
+Requires:		tintii
+Requires:		ffmulticonverter
+
+%description
+This package installs LALIS choosen packages and some configurations.
+
+%package minimal
+Summary:			Install minimal LALIS packages and configuration
+Group:				Tools
+BuildArch:			noarch
+Requires:		sweeper
 Requires:		vlc-plugin-opengl
 Requires:		vlc-plugin-pulse
 Requires:		vlc-plugin-vdpau
@@ -76,16 +69,28 @@ Requires:		vlc-plugin-twolame
 Requires:		vlc-plugin-upnp
 Requires:		vlc-plugin-zvbi
 Requires:		vlc-qt
-Requires:		flash-player-plugin
+Requires:		kate
-Requires:		system-config-printer
+Requires:		openssh-server
-Requires:		task-printing-scanning
+Requires:		sshfs-fuse
-Requires:		gsmartcontrol
+Requires:		lsb-release
-Requires:		bind-utils
+Requires:		wpa_supplicant
-Requires:		k3b
+Requires:		lshw
-Requires:		luckybackup
+Requires:		x11-driver-input-synaptics
-Requires:		kpat
+Requires:		bsdiff
-Requires:		gimp-plugin-bimp
+Requires:		fuse-exfat
-Requires:		audiokonverter
+Requires:		mageia-theme-extra
+Requires:		gvfs-mtp
+Requires:		mtpfs
+Requires:		libmtp-utils
+Requires:		simple-mtpfs
+Requires:		gmtp
+Requires:		qtbluetooth5
+Requires:		pulseaudio-module-bluetooth
+Requires:		krfb
+Requires:		clementine
+Requires:		aspell-fr
+Requires:		transcode
+Requires:		plasma-applet-systemloadviewer
 Requires:		gnubg
 Requires:		v4l-utils
 Requires:		gutenprint-gimp2
@@ -98,35 +103,35 @@ Requires:		fuse-exfat
 Requires:		exfat-utils
 Requires:		simple-scan
 Requires:		kipi-plugins
-Requires:		tintii
+Requires:		gimp-plugin-bimp
-Requires:		krfb
+Requires:		flash-player-plugin
-Requires:		clementine
+Requires:		system-config-printer
-Requires:		aspell-fr
+Requires:		task-printing-scanning
-Requires:		transcode
+Requires:		gsmartcontrol
-Requires:		plasma-applet-systemloadviewer
+Requires:		bind-utils
-Requires:		ffmulticonverter
+Requires:		k3b
+Requires:		luckybackup
+Requires:		lame
 Requires:		print-manager
-Requires:		sweeper
+Requires:		ark
-Requires:		gvfs-mtp
+Requires:		kim4
-Requires:		mtpfs
+Requires:		krename
-Requires:		libmtp-utils
+Requires:		evince
-Requires:		simple-mtpfs
+Requires:		audacity
-Requires:		gmtp
+Requires:		kdenlive
-Requires:		qtbluetooth5
+Requires:		spamassassin
-Requires:		pulseaudio-module-bluetooth
+Requires:		p7zip
+Requires:		unrar
+Requires:		ssmtp
+Requires:		kwallet-pam
+Requires:		kpdftool
+Requires:		ktorrent
 Requires:		kdeconnect-kde
 Requires:		chromium-browser
-Requires:		fuse-exfat
-Requires:		mageia-theme-extra
-Requires:		chromium-browser
-Requires:		lshw
-Requires:		x11-driver-input-synaptics
-Requires:		bsdiff
-Requires:		lsb-release
-Requires:		wpa_supplicant
 
-%description
+%description minimal
-This package installs LALIS choosen packages and some configurations.
+This package installs LALIS minimal choosen packages and some configurations.
+
 
 %install
 mkdir -p %{buildroot}/tmp/
@@ -143,7 +148,7 @@ cp -f %{SOURCE5} %{buildroot}/usr/share/dist/desktop-files/default/
 cp -f %{SOURCE6} %{buildroot}/usr/share/lalis/
 cp -f %{SOURCE7} %{buildroot}/usr/share/lalis/
 
-%files
+%files minimal
 
 /tmp/journald.conf
 /usr/local/bin/lalistunnel
@@ -152,10 +157,10 @@ cp -f %{SOURCE7} %{buildroot}/usr/share/lalis/
 /usr/share/lalis/*
 /usr/share/dist/desktop-files/default/*
 
-%post
+%post minimal
 
 # configuration de l'assistance à distance
-# créer un utilisateur Lalis enlève les droits de lecture/écriture/visibilité/exécution à others
+# crée un utilisateur Lalis et enlève les droits de lecture/écriture/visibilité/exécution à others
 desktop()
 {
 	DESKTOP=`grep XDG_DESKTOP_DIR $1/.config/user-dirs.dirs`
@@ -211,7 +216,14 @@ do
 		fi
 	fi
 done
-#WIFI=`lshw -C network|grep -c wlp`
+
-#if [ $WIFI -ne 0 ];then
+#disabling mdadm when no raid detected
-#	urpmi wpa_supplicant
+MD=`grep -c active /proc/mdstat`
-#fi
+if [ $MD > 0 ]; then
+	systemctl disable mdadm.service
+fi
+
+#disabling network-up if nfs not used
+if [ ! -e /etc/nfs.conf ]; then
+	systemctl disable network-up
+fi