From a3dd2ea8653a60cf889eacfd73d29c0b9b1eb777 Mon Sep 17 00:00:00 2001 From: Michael Filanov Date: Tue, 9 Jul 2024 10:37:43 +0300 Subject: [PATCH] Fix rpm conflict with sos adding sos to obsolete adding sos-mlx-cloud-verification.conf to rpm build --- sos.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sos.spec b/sos.spec index 60d7ad1b8c..07fe440809 100644 --- a/sos.spec +++ b/sos.spec @@ -19,7 +19,7 @@ Recommends: python3-magic # Mandatory just for uploading to a SFTP server: Recommends: python3-requests Recommends: python3-pyyaml -Obsoletes: sos-collector <= 1.9 +Obsoletes: sos-collector <= 1.9, sos <= 4.0 # For the _tmpfilesdir macro. BuildRequires: systemd # Mandatory just for uploading to an S3 bucket: @@ -63,6 +63,7 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/%{sosname}/groups.d install -d -m 755 %{buildroot}%{_sysconfdir}/%{sosname}/extras.d install -d -m 755 %{buildroot}%{_tmpfilesdir} install -m 644 %{sosname}.conf %{buildroot}%{_sysconfdir}/%{sosname}/%{sosname}.conf +install -m 644 sos-mlx-cloud-verification.conf %{buildroot}%{_sysconfdir}/%{sosname}/sos-mlx-cloud-verification.conf install -m 644 tmpfiles/tmpfilesd-sos-rh.conf %{buildroot}%{_tmpfilesdir}/%{sosname}.conf rm -rf %{buildroot}/usr/config/ @@ -92,6 +93,7 @@ rm -rf %{buildroot}/usr/config/ %doc AUTHORS README.md %license LICENSE %config(noreplace) %{_sysconfdir}/sos/sos.conf +%config(noreplace) %{_sysconfdir}/sos/sos-mlx-cloud-verification.conf %changelog * Fri Jun 21 2024 Pavel Moravec = 4.7.2