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
This commit is contained in:
Martin Pluskal 2020-10-13 12:39:58 +00:00 committed by Git OBS Bridge
parent 2dac603819
commit ad8aafeb66
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 13 10:06:24 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Do not suppress error text output from useradd.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 8 12:11:10 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr> Wed Apr 8 12:11:10 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -124,7 +124,7 @@ find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g
%make_build %make_build
%install %install
make DESTDIR=%{buildroot} htmldir=%{_docdir}/oprofile install %make_install htmldir=%{_docdir}/oprofile
rm -f %{buildroot}%{_libdir}/oprofile/libopagent.*a rm -f %{buildroot}%{_libdir}/oprofile/libopagent.*a
# Hardlink duplicate files automatically (from package fdupes): # Hardlink duplicate files automatically (from package fdupes):
# It doesn't save much, but it keeps rpmlint from breaking the package build. # 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 %pre
getent group oprofile >/dev/null || \ getent group oprofile >/dev/null || \
%{_sbindir}/groupadd -r oprofile 2>/dev/null %{_sbindir}/groupadd -r oprofile
getent passwd oprofile >/dev/null || \ getent passwd oprofile >/dev/null || \
%{_sbindir}/useradd -r -g oprofile -d %{_localstatedir}/lib/empty \ %{_sbindir}/useradd -r -g oprofile -d %{_localstatedir}/lib/empty \
-s /bin/false -c "Special user account to be used by OProfile" \ -s /bin/false -c "Special user account to be used by OProfile" \
oprofile 2>/dev/null oprofile
%post -n libopagent1 -p /sbin/ldconfig %post -n libopagent1 -p /sbin/ldconfig
%postun -n libopagent1 -p /sbin/ldconfig %postun -n libopagent1 -p /sbin/ldconfig