SHA256
1
0
forked from pool/aaa_base

Accepting request 1192951 from Base:System

- Update to version 84.87+git20240809.5d13eb4:
  * cleanup aaa_base.post and fold back into specfile (forwarded request 1192950 from kukuk)

OBS-URL: https://build.opensuse.org/request/show/1192951
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=503
This commit is contained in:
Dominique Leuenberger 2024-08-11 14:55:28 +00:00 committed by Git OBS Bridge
commit ea01be3c92
6 changed files with 27 additions and 8 deletions

2
.gitattributes vendored
View File

@ -22,4 +22,4 @@
*.zip filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns ## Specific LFS patterns
aaa_base-84.87+git20240805.7513b28.tar filter=lfs diff=lfs merge=lfs -text aaa_base-84.87+git20240809.5d13eb4.tar filter=lfs diff=lfs merge=lfs -text

View File

@ -1,5 +1,5 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">https://github.com/openSUSE/aaa_base.git</param> <param name="url">https://github.com/openSUSE/aaa_base.git</param>
<param name="changesrevision">7513b28cbec32ad78af7203b073c005230ab39f3</param></service> <param name="changesrevision">5d13eb4bf0438b5c6c9624b64d1eda2fb2459112</param></service>
</servicedata> </servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4197f2fc3caf74b156ae3000ab69563ce7b2585f31e6e5572867c15bfff241a4
size 348160

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28abbf17a1181a1cbaec00a43141a9337bddd49be6dc2637cdd95ff7aec795b6
size 348160

View File

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

View File

@ -33,7 +33,7 @@ BuildRequires: git-core
%endif %endif
Name: aaa_base Name: aaa_base
Version: 84.87+git20240805.7513b28%{git_version} Version: 84.87+git20240809.5d13eb4%{git_version}
Release: 0 Release: 0
Summary: openSUSE Base Package Summary: openSUSE Base Package
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -154,7 +154,21 @@ mkdir -p %{buildroot}%{_fillupdir}
rm -vrf %{buildroot}/usr/share/fillup-templates rm -vrf %{buildroot}/usr/share/fillup-templates
%endif %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 %pre extras
%service_add_pre backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer %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 /usr/lib/sysctl.d/51-network.conf
%{_fillupdir}/sysconfig.language %{_fillupdir}/sysconfig.language
%{_fillupdir}/sysconfig.proxy %{_fillupdir}/sysconfig.proxy
%{_fillupdir}/sysconfig.windowmanager
%files extras %files extras
/usr/etc/skel/.emacs /usr/etc/skel/.emacs