From ad8aafeb663ee5db5054b7bf2e6340a2c36cc449e8ee4ae86e1f0ea08ffe7747 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 13 Oct 2020 12:39:58 +0000 Subject: [PATCH] Accepting request 841484 from home:jengelh:branches:devel:tools - Do not suppress error text output from useradd. OBS-URL: https://build.opensuse.org/request/show/841484 OBS-URL: https://build.opensuse.org/package/show/devel:tools/oprofile?expand=0&rev=60 --- oprofile.changes | 5 +++++ oprofile.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/oprofile.changes b/oprofile.changes index 814b9ed..2c71a08 100644 --- a/oprofile.changes +++ b/oprofile.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 13 10:06:24 UTC 2020 - Jan Engelhardt + +- Do not suppress error text output from useradd. + ------------------------------------------------------------------- Wed Apr 8 12:11:10 UTC 2020 - Christophe Giboudeaux diff --git a/oprofile.spec b/oprofile.spec index fecdb44..c69899c 100644 --- a/oprofile.spec +++ b/oprofile.spec @@ -124,7 +124,7 @@ find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g %make_build %install -make DESTDIR=%{buildroot} htmldir=%{_docdir}/oprofile install +%make_install htmldir=%{_docdir}/oprofile rm -f %{buildroot}%{_libdir}/oprofile/libopagent.*a # Hardlink duplicate files automatically (from package fdupes): # It doesn't save much, but it keeps rpmlint from breaking the package build. @@ -132,11 +132,11 @@ rm -f %{buildroot}%{_libdir}/oprofile/libopagent.*a %pre getent group oprofile >/dev/null || \ - %{_sbindir}/groupadd -r oprofile 2>/dev/null + %{_sbindir}/groupadd -r oprofile getent passwd oprofile >/dev/null || \ %{_sbindir}/useradd -r -g oprofile -d %{_localstatedir}/lib/empty \ -s /bin/false -c "Special user account to be used by OProfile" \ - oprofile 2>/dev/null + oprofile %post -n libopagent1 -p /sbin/ldconfig %postun -n libopagent1 -p /sbin/ldconfig