diff --git a/desktop-base-openmamba.spec b/desktop-base-openmamba.spec index d59a668..1805dd8 100644 --- a/desktop-base-openmamba.spec +++ b/desktop-base-openmamba.spec @@ -11,8 +11,8 @@ %define distroicon openmamba Name: desktop-base-openmamba -Version: 2024.11.01 -Release: 2mamba +Version: 2024.12.05 +Release: 1mamba Summary: openmamba default desktop theme and menu entries Group: System/Tools Vendor: openmamba @@ -96,6 +96,7 @@ Summary: openmamba base tools for non graphical system Requires: avahi Requires: audit Requires: bash-completion +Requires: coreutils Requires: curl Requires: dbus Requires: debianutils @@ -103,8 +104,13 @@ Requires: diffutils Requires: dnf Requires: dosfstools Requires: dracut +Requires: e2fsprogs +Requires: findutils Requires: file Requires: fuse-exfat +Requires: gawk +Requires: grep +Requires: hwdata Requires: javapackages Requires: libarchive-tools Requires: man-pages @@ -112,12 +118,15 @@ Requires: netsrpms Requires: openmamba-icons Requires: openmamba-release Requires: pam +Requires: psmisc Requires: rfkill Requires: rootfiles Requires: rpm +Requires: sed Requires: sudo -Requires: systemd +Requires: systemd >= 2:256.9-2mamba Requires: systemd-cron +Requires: tzdata Requires: xdg-utils Requires: xdg-user-dirs Requires: yum-utils @@ -135,6 +144,10 @@ Obsoletes: libaccount-plugin <= 0.1.5 # Fake provide to resolve build requirement no longer built on ix86 Provides: qt6-qtwebengine-devel %endif +Provides: initscripts +Obsoletes: initscripts <= 2.6-1mamba +Obsoletes: initscripts-tools <= 2.6-1mamba +Obsoletes: initscripts-sysv5 < 2.4 %description -n system-base-openmamba openmamba base tools for non graphical system. @@ -174,6 +187,61 @@ _EOF %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} +%post -n system-base-openmamba +if [ $1 -ge 1 ]; then + # create /etc/locale.conf with LANG settings if missing + [ "$LANG" -a ! -e /etc/locale.conf ] && { + [ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n + cat >> /etc/locale.conf << _EOF +LANG=${LANG} +LC_COLLATE=C +_EOF + } + +# # create /etc/rpm/macros.lang to install only translations in current LANG plus en +# [ "$LANG" -a ! -e %{_sysconfdir}/rpm/macros.lang ] && { +# cat >> %{_sysconfdir}/rpm/macros.lang << _EOF +#`echo -n %`_install_langs en:${LANG/_*}:${LANG/.*} +#_EOF +# } + + [ -e /etc/vconsole.conf ] || { + . /etc/sysconfig/keyboard + . /etc/sysconfig/console + [ $CONSOLE_UNICODEMAP ] || CONSOLE_UNICODEMAP=8859-1_to_uni + cat > $MOUNTDIR/etc/vconsole.conf << _EOF +KEYMAP=${KEYMAP/.*} +FONT=${CONSOLE_FONT/.*} +FONT_MAP=${CONSOLE_UNICODEMAP} +FONT_UNIMAP= +UNICODE=1 +_EOF + } + + grep "UNICODE=" /etc/vconsole.conf >/dev/null || { + cat >> /etc/vconsole.conf << _EOF +UNICODE=1 +_EOF + } + + # systemd wants /etc/localtime as a symlink to /usr/share/timezone/.. + if [ -e %{_sysconfdir}/timezone -a ! -L %{_sysconfdir}/localtime ]; then + TMZ=`cat %{_sysconfdir}/timezone` + [ -e %{_datadir}/zoneinfo/$TMZ ] && { + rm -f %{_sysconfdir}/localtime + ln -sf %{_datadir}/zoneinfo/$TMZ %{_sysconfdir}/localtime + } + fi +fi +: + +%posttrans -n system-base-openmamba +if [ $1 -ge 1 ]; then + # Apply updated sysctl settings + sysctl -q --system +fi +: + %triggerpostun -n system-base-openmamba -- grub # Update for secure boot on grub update sb-setup -q || : @@ -190,11 +258,15 @@ sb-setup -q || : %{_sysconfdir}/profile.d/libreoffice.sh %{_sysconfdir}/sudoers.d/proxy %config (noreplace) %{_sysconfdir}/sysconfig/proxy -%config %{_sysconfdir}/prelink.conf.d/skype.conf %{_sysconfdir}/sudoers.d/dnf %{_bindir}/os-makereport %{_bindir}/openmamba-update %{_bindir}/sb-setup +%{_bindir}/service +%{_modprobedir}/blacklist-net.conf +%{_modprobedir}/lp.conf +%{_modprobedir}/rtl8192ce.conf +%{_sysctldir}/40-openmamba.conf %files %defattr(-,root,root) @@ -206,6 +278,10 @@ sb-setup -q || : %{_datadir}/openmamba/desktop/desktop-*.tar.bz2 %changelog +* Thu Dec 05 2024 Automatic Build System 2024.12.05-1mamba +- update to 2024.12.05 +- obsoletes initscripts + * Thu Nov 21 2024 Silvan Calarco 2024.11.01-2mamba - replace recommend with require for pipewire-pulse