From f9763c2577ec6abfa4db7749f09e0384b3438c3ca204ae8ea04ffc898c34bba5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 9 Jan 2018 13:55:12 +0000 Subject: [PATCH] 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 --- libnss_usrfiles.changes | 6 ++++++ libnss_usrfiles.spec | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libnss_usrfiles.changes b/libnss_usrfiles.changes index acfecd0..e92f65a 100644 --- a/libnss_usrfiles.changes +++ b/libnss_usrfiles.changes @@ -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 diff --git a/libnss_usrfiles.spec b/libnss_usrfiles.spec index 568a9ff..a3d6d35 100644 --- a/libnss_usrfiles.spec +++ b/libnss_usrfiles.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -37,8 +37,8 @@ group data. %package -n libnss_usrfiles2 Summary: NSS usrfiles plugin for glibc -Group: System/Libraries # we need cp +Group: System/Libraries Requires(post): coreutils Requires(post): glibc Requires(post): sed @@ -62,11 +62,7 @@ mkdir -p %{buildroot}%{_prefix}/etc %post -n libnss_usrfiles2 /sbin/ldconfig 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 -%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