From 53a6335a491ce0ea6ff0258f659c4bc671dc6f5e Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 06:24:36 +0100
Subject: [PATCH] update to 2.9.92 move liveuser environment apart to
 live-user-environment subpackage [release 2.9.92-1mamba;Sat Mar 14 2015]

---
 livecd-tools.spec | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/livecd-tools.spec b/livecd-tools.spec
index 9c5cc2c..09c27a1 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -2,7 +2,7 @@
 %define        lpadmin_uid 65032
 %define        lpadmin_gid 65032
 Name:          livecd-tools
-Version:       2.9.91
+Version:       2.9.92
 Release:       1mamba
 Summary:       Live cd environment and utilities
 Group:         System/Tools
@@ -27,6 +27,7 @@ Requires:      calamares
 Requires:      grub
 Requires:      grub-efi-x86_64
 %endif
+Requires:      live-user-environment
 BuildRoot:     %{_tmppath}/%{name}-%{version}-buildroot
 
 %description
@@ -35,6 +36,17 @@ Live cd utilities:
 - installer: openmamba installation tool
 - eject_cd.sh: forces CD eject for livecd shutdown
 
+%package -n live-user-environment
+Summary:       Configure a default user ('liveuser') for live environment
+Group:         System/Configuration
+Requires(post):sudo
+Requires(post):system-base-openmamba
+Requires(post):desktop-base-openmamba
+Requires:      systemd
+
+%description -n live-user-environment
+Configure a default user ('liveuser') for live environment.
+
 %prep
 %setup -q
 
@@ -47,7 +59,7 @@ Live cd utilities:
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
-%pre
+%pre -n live-user-environment
 if [ $1 -eq 1 ]; then
 # add lpadmin user if cups is not installed before
    /usr/sbin/groupadd lpadmin -g %{lpadmin_gid} &>/dev/null
@@ -62,7 +74,7 @@ if [ $1 -eq 1 ]; then
 fi
 :
 
-%post
+%post -n live-user-environment
 if [ $1 -eq 1 ]; then
    chmod 711 /home/liveuser
    mkdir /home/liveuser/Desktop/
@@ -77,7 +89,7 @@ if [ $1 -eq 1 ]; then
 fi
 :
 
-%postun
+%postun -n live-user-environment
 if [ $1 -eq 0 ]; then
    userdel -r -f liveuser
    # Unconfigure KDM for autologin
@@ -102,7 +114,7 @@ fi
 #%endif
 :
 
-%posttrans
+%posttrans -n live-user-environment
 gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null
 if [ $1 -eq 1 ]; then
    # Configure KDM for autologin
@@ -138,18 +150,23 @@ fi
 %{_sysconfdir}/calamares/branding/openmamba/*
 %dir %{_sysconfdir}/calamares/modules
 %{_sysconfdir}/calamares/modules/*.conf
-%{_sysconfdir}/systemd/system/autovt@.service
-%attr(0440,root,root) %{_sysconfdir}/sudoers.d/liveuser
-/sbin/eject_cd.sh
-/sbin/login.live
 %{_datadir}/applications/openmamba-installer.desktop
 %{_datadir}/icons/hicolor/*/apps/installer.png
+
+%files -n live-user-environment
+%defattr(-,root,root)
+%{_sysconfdir}/systemd/system/autovt@.service
+%attr(0440,root,root) %{_sysconfdir}/sudoers.d/liveuser
 %attr(-,liveuser,users) %dir /home/liveuser/.kde4
 %attr(-,liveuser,users) %dir /home/liveuser/.kde4/share
 %attr(-,liveuser,users) %dir /home/liveuser/.kde4/share/config
 %attr(-,liveuser,users) /home/liveuser/.kde4/share/config/*
 
 %changelog
+* Sat Mar 14 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 2.9.92-1mamba
+- update to 2.9.92
+- move liveuser environment apart to live-user-environment subpackage
+
 * Sun Feb 22 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 2.9.91-1mamba
 - update to 2.9.91