Sync from SUSE:SLFO:Main aaa_base revision fa2af68868e3dbc61e60f96ed777f711

_servicedata

@@ -1,5 +1,5 @@
 <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>

aaa_base.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Mon Aug 05 09:15:00 UTC 2024 - ro@suse.com
 

aaa_base.spec

@@ -33,7 +33,7 @@ BuildRequires:  git-core
 %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 @@ mkdir -p %{buildroot}%{_fillupdir}
   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 @@ mkdir -p %{buildroot}%{_fillupdir}
 /usr/lib/sysctl.d/51-network.conf
 %{_fillupdir}/sysconfig.language
 %{_fillupdir}/sysconfig.proxy
-%{_fillupdir}/sysconfig.windowmanager
 
 %files extras
 /usr/etc/skel/.emacs