diff --git a/opentelemetry-collector.spec b/opentelemetry-collector.spec index 1aad65e..892f49d 100644 --- a/opentelemetry-collector.spec +++ b/opentelemetry-collector.spec @@ -12,7 +12,7 @@ Collector with the supported components for a Red Hat build of OpenTelemetry} %global godocs README.md Name: opentelemetry-collector -Release: 4%{?dist} +Release: 3%{?dist} Summary: Red Hat build of OpenTelemetry License: Apache-2.0 @@ -26,8 +26,6 @@ BuildRequires: binutils BuildRequires: git BuildRequires: policycoreutils, checkpolicy, selinux-policy-devel -Requires(pre): shadow-utils -Requires(pre): util-linux Requires(pre): /usr/sbin/useradd, /usr/bin/getent Requires(postun): /usr/sbin/userdel @@ -70,9 +68,8 @@ install -m 0755 -p ./opentelemetry-collector-with-options %{buildroot}%{_bindir} /usr/bin/getent group observability > /dev/null || /usr/sbin/groupadd -r observability /usr/bin/getent passwd observability > /dev/null || /usr/sbin/useradd -r -M -s /sbin/nologin -g observability -G systemd-journal observability -if [ $1 -eq 0 ]; then - /usr/sbin/userdel observability -fi +%postun +/usr/sbin/userdel observability %post semodule -i %{_datadir}/selinux/packages/otel_collector_journald.pp @@ -105,12 +102,6 @@ fi %{_bindir}/* %changelog -* Mon Mar 03 2025 Conor Cowman - 0.107.0-4 -- Bump revision -- Add runtime requirements for shadow-utils and util-linux to ensure successful creation of observability user on installation -- Modify post-uninstallation stage to only delete delete the observability user on full uninstallation to prevent the user being deleted during upgrades - Resolves: RHEL-81967 - * Wed Feb 12 2025 Conor Cowman - 0.107.0-3 - Bump revision - Update tarball golang from 1.21.0 to 1.22.11