Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2024-08-11 16:55:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base" Sun Aug 11 16:55:28 2024 rev:503 rq:1192951 version:84.87+git20240809.5d13eb4 Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2024-08-06 09:07:14.075000205 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new.7232/aaa_base.changes 2024-08-11 16:55:29.450522647 +0200 @@ -1,0 +2,6 @@ +Fri Aug 09 13:44:32 UTC 2024 - kukuk@suse.com + +- Update to version 84.87+git20240809.5d13eb4: + * cleanup aaa_base.post and fold back into specfile + +------------------------------------------------------------------- Old: ---- aaa_base-84.87+git20240805.7513b28.tar New: ---- aaa_base-84.87+git20240809.5d13eb4.tar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.CCFfTW/_old 2024-08-11 16:55:30.634571857 +0200 +++ /var/tmp/diff_new_pack.CCFfTW/_new 2024-08-11 16:55:30.638572024 +0200 @@ -33,7 +33,7 @@ %endif Name: aaa_base -Version: 84.87+git20240805.7513b28%{git_version} +Version: 84.87+git20240809.5d13eb4%{git_version} Release: 0 Summary: openSUSE Base Package License: GPL-2.0-or-later @@ -154,7 +154,21 @@ rm -vrf %{buildroot}/usr/share/fillup-templates %endif -%post -f aaa_base.post +%post +export LC_ALL=C + +#XXX Fix /etc/nsswitch.conf to include usrfiles [bsc#1162916] +if [ -e /etc/nsswitch.conf ]; then + for key in services protocols rpc ; do + if ! grep -q ^${key}.*usrfiles /etc/nsswitch.conf ; then + cp /etc/nsswitch.conf /etc/nsswitch.conf.pre-usrfiles.${key} + sed -i -e "s|^\(${key}:.*[[:space:]]\)files\([[:space:]].*\)*$|\1files usrfiles\2|" /etc/nsswitch.conf + fi + done +fi + +%{fillup_only -n language} +%{fillup_only -n proxy} %pre extras %service_add_pre backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer @@ -225,7 +239,6 @@ /usr/lib/sysctl.d/51-network.conf %{_fillupdir}/sysconfig.language %{_fillupdir}/sysconfig.proxy -%{_fillupdir}/sysconfig.windowmanager %files extras /usr/etc/skel/.emacs ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.CCFfTW/_old 2024-08-11 16:55:30.710575015 +0200 +++ /var/tmp/diff_new_pack.CCFfTW/_new 2024-08-11 16:55:30.714575182 +0200 @@ -1,7 +1,7 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/aaa_base.git</param> - <param name="changesrevision">7513b28cbec32ad78af7203b073c005230ab39f3</param></service> + <param name="changesrevision">5d13eb4bf0438b5c6c9624b64d1eda2fb2459112</param></service> </servicedata> (No newline at EOF) ++++++ aaa_base-84.87+git20240805.7513b28.tar -> aaa_base-84.87+git20240809.5d13eb4.tar ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20240805.7513b28/aaa_base.post new/aaa_base-84.87+git20240809.5d13eb4/aaa_base.post --- old/aaa_base-84.87+git20240805.7513b28/aaa_base.post 2024-08-05 11:06:18.000000000 +0200 +++ new/aaa_base-84.87+git20240809.5d13eb4/aaa_base.post 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -#!/bin/sh -# -# -# post.sh - to be done after extraction -# -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# -# Run this script in C-Locale, or some tools will fail. -export LC_ALL=C - -if [ "$1" -gt 1 ]; then - # clock variables dropped after 13.1 - %{remove_and_set -n clock SYSTOHC FORCE_SYSTOHC BADYEAR HCTOSYS_DEVICE USE_HWCLOCK USE_ADJUST} -fi - -#XXX Fix /etc/nsswitch.conf to include usrfiles [bsc#1162916] -if [ -e /etc/nsswitch.conf ]; then - for key in services protocols rpc ; do - grep -q ^${key}.*usrfiles /etc/nsswitch.conf - if [ $? -eq 1 ]; then - cp /etc/nsswitch.conf /etc/nsswitch.conf.pre-usrfiles.${key} - sed -i -e "s|^\(${key}:.*[[:space:]]\)files\([[:space:]].*\)*$|\1files usrfiles\2|" /etc/nsswitch.conf - fi - done -fi - -for i in language proxy windowmanager ; do -%{fillup_only -n $i} -done - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20240805.7513b28/aaa_base.spec new/aaa_base-84.87+git20240809.5d13eb4/aaa_base.spec --- old/aaa_base-84.87+git20240805.7513b28/aaa_base.spec 2024-08-05 11:06:18.000000000 +0200 +++ new/aaa_base-84.87+git20240809.5d13eb4/aaa_base.spec 2024-08-09 15:37:42.000000000 +0200 @@ -154,7 +154,21 @@ rm -vrf %{buildroot}/usr/share/fillup-templates %endif -%post -f aaa_base.post +%post +export LC_ALL=C + +#XXX Fix /etc/nsswitch.conf to include usrfiles [bsc#1162916] +if [ -e /etc/nsswitch.conf ]; then + for key in services protocols rpc ; do + if ! grep -q ^${key}.*usrfiles /etc/nsswitch.conf ; then + cp /etc/nsswitch.conf /etc/nsswitch.conf.pre-usrfiles.${key} + sed -i -e "s|^\(${key}:.*[[:space:]]\)files\([[:space:]].*\)*$|\1files usrfiles\2|" /etc/nsswitch.conf + fi + done +fi + +%{fillup_only -n language} +%{fillup_only -n proxy} %pre extras %service_add_pre backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer @@ -225,7 +239,6 @@ /usr/lib/sysctl.d/51-network.conf %{_fillupdir}/sysconfig.language %{_fillupdir}/sysconfig.proxy -%{_fillupdir}/sysconfig.windowmanager %files extras /usr/etc/skel/.emacs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20240805.7513b28/files/usr/share/fillup-templates/sysconfig.windowmanager new/aaa_base-84.87+git20240809.5d13eb4/files/usr/share/fillup-templates/sysconfig.windowmanager --- old/aaa_base-84.87+git20240805.7513b28/files/usr/share/fillup-templates/sysconfig.windowmanager 2024-08-05 11:06:18.000000000 +0200 +++ new/aaa_base-84.87+git20240809.5d13eb4/files/usr/share/fillup-templates/sysconfig.windowmanager 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -## Path: Desktop/Window manager -## Description: -## Type: string(default,gnome,plasma5,lxde,xfce,twm,icewm,enlightenment) -## Default: default -## Config: profiles,kde,susewm -# -# Here you can set the default window manager (kde, fvwm, ...) -# changes here require at least a re-login. -# -# This value is deprecated and not read by most display managers. -# Use 'update-alternatives --config default-xsession.desktop' for configuration instead. - -DEFAULT_WM="default" - -## Type: yesno -## Default: yes -# -# install the SUSE extension for new users -# (theme and additional functions) -# -INSTALL_DESKTOP_EXTENSIONS="yes"