diff --git a/README.md b/README.md index 41bcf38..ecc1afb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # livecd-tools Live cd utilities: - - configurare a default user ('liveuser') for live environment +- installer: openmamba installation tool +- eject_cd.sh: forces CD eject for livecd shutdown + diff --git a/livecd-tools.spec b/livecd-tools.spec index eb1904e..9c5cc2c 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -2,8 +2,8 @@ %define lpadmin_uid 65032 %define lpadmin_gid 65032 Name: livecd-tools -Version: 2.9.0 -Release: 2mamba +Version: 2.9.91 +Release: 1mamba Summary: Live cd environment and utilities Group: System/Tools Vendor: openmamba @@ -16,14 +16,6 @@ Source2: %{name}-Autostart-setkeyboard License: GPL ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END -%if "%{stage1}" != "1" -Requires: kommander -Requires: parted -Requires: gparted -Requires: md5deep -Requires: /usr/bin/cdrecord -%endif -Requires: udisks Requires(pre): rpm Requires(pre): udev Requires(post):sudo @@ -39,12 +31,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot %description Live cd utilities: - - configurare a default user ('liveuser') for live environment -%if "%{stage1}" != "1" -- installer: system installer scripts and kommander interface +- installer: openmamba installation tool - eject_cd.sh: forces CD eject for livecd shutdown -%endif %prep %setup -q @@ -54,13 +43,6 @@ Live cd utilities: %install %makeinstall -%find_lang installer - -%if "%{stage1}" == "1" -rm -f %{buildroot}%{_datadir}/openmamba/installer/installer.kmdr -rm -f %{buildroot}%{_datadir}/applications/openmamba-installer.desktop -rm -f %{buildroot}%{_datadir}/icons/hicolor/*/apps/installer.png -%endif %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -83,17 +65,14 @@ fi %post if [ $1 -eq 1 ]; then chmod 711 /home/liveuser -%if "%{stage1}" != "1" mkdir /home/liveuser/Desktop/ cp /usr/share/applications/openmamba-installer.desktop /home/liveuser/Desktop/ - cp /usr/share/applications/openmamba-bootrecover.desktop /home/liveuser/Desktop/ chmod +x /home/liveuser/Desktop/*.desktop ## configure for cd eject at halt/reboot # sed -i -e '/halt .*/i \ # /sbin/eject_cd.sh 2>&1 >/dev/null' /etc/init.d/halt # sed -i -e '/reboot .*/i \ # /sbin/eject_cd.sh 2>&1 >/dev/null' /etc/init.d/reboot -%endif chown -R liveuser.users /home/liveuser fi : @@ -150,7 +129,7 @@ _EOF fi : -%files -f installer.lang +%files %defattr(-,root,root) %dir %{_sysconfdir}/calamares %{_sysconfdir}/calamares/settings.conf @@ -160,26 +139,23 @@ fi %dir %{_sysconfdir}/calamares/modules %{_sysconfdir}/calamares/modules/*.conf %{_sysconfdir}/systemd/system/autovt@.service -%attr(0440,root,root) %{_sysconfdir}/sudoers.d/installer %attr(0440,root,root) %{_sysconfdir}/sudoers.d/liveuser -%config(noreplace) %{_sysconfdir}/sysconfig/installer /sbin/eject_cd.sh /sbin/login.live -%dir %{_datadir}/openmamba/installer -%if "%{stage1}" != "1" -%{_datadir}/openmamba/installer/installer.kmdr %{_datadir}/applications/openmamba-installer.desktop %{_datadir}/icons/hicolor/*/apps/installer.png -%endif -%{_datadir}/openmamba/installer/gpl*.html -%{_datadir}/openmamba/installer/installer.sh -%{_datadir}/openmamba/installer/md5progress.sh %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 +* Sun Feb 22 2015 Silvan Calarco 2.9.91-1mamba +- update to 2.9.91 + +* Sun Feb 22 2015 Silvan Calarco 2.9.90-1mamba +- update to 2.9.90 + * Fri Feb 20 2015 Silvan Calarco 2.9.0-2mamba - configure and unconfigure liveuser for autologin in posttran script