Accepting request 562559 from devel:CaaSP

- The default nsswitch.conf has changed again back to the old
  values [bsc#1074515]

OBS-URL: https://build.opensuse.org/request/show/562559
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnss_usrfiles?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2018-01-09 13:55:12 +00:00 committed by Git OBS Bridge
parent 994cd0854c
commit f9763c2577
2 changed files with 8 additions and 6 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 8 15:54:04 CET 2018 - kukuk@suse.de
- The default nsswitch.conf has changed again back to the old
values [bsc#1074515]
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 30 14:37:03 UTC 2017 - jengelh@inai.de Thu Mar 30 14:37:03 UTC 2017 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package libnss_usrfiles # spec file for package libnss_usrfiles
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -37,8 +37,8 @@ group data.
%package -n libnss_usrfiles2 %package -n libnss_usrfiles2
Summary: NSS usrfiles plugin for glibc Summary: NSS usrfiles plugin for glibc
Group: System/Libraries
# we need cp # we need cp
Group: System/Libraries
Requires(post): coreutils Requires(post): coreutils
Requires(post): glibc Requires(post): glibc
Requires(post): sed Requires(post): sed
@ -62,11 +62,7 @@ mkdir -p %{buildroot}%{_prefix}/etc
%post -n libnss_usrfiles2 %post -n libnss_usrfiles2
/sbin/ldconfig /sbin/ldconfig
cp -a %{_sysconfdir}/nsswitch.conf %{_sysconfdir}/nsswitch.conf.nss_usrfiles cp -a %{_sysconfdir}/nsswitch.conf %{_sysconfdir}/nsswitch.conf.nss_usrfiles
%if 0%{?suse_version} < 1330
sed -i -e 's|^passwd: compat$|passwd: files usrfiles|g' -e 's|^group: compat$|group: files usrfiles|g' %{_sysconfdir}/nsswitch.conf sed -i -e 's|^passwd: compat$|passwd: files usrfiles|g' -e 's|^group: compat$|group: files usrfiles|g' %{_sysconfdir}/nsswitch.conf
%else
sed -i -e 's|^passwd: compat [NOTFOUND=return] files$|passwd: files usrfiles|g' -e 's|^group: compat [NOTFOUND=return] files$|group: files usrfiles|g' %{_sysconfdir}/nsswitch.conf
%endif
%postun -n libnss_usrfiles2 -p /sbin/ldconfig %postun -n libnss_usrfiles2 -p /sbin/ldconfig