From fc96880030704ba4ad9614a73be5a4877a7881b4 Mon Sep 17 00:00:00 2001 From: Michael Filanov Date: Sun, 7 Jul 2024 12:08:35 +0300 Subject: [PATCH] change RPM build to build doca-sosreport --- sos.spec | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/sos.spec b/sos.spec index fcb0d78d00..60d7ad1b8c 100644 --- a/sos.spec +++ b/sos.spec @@ -1,8 +1,8 @@ Summary: A set of tools to gather troubleshooting information from a system -Name: sos -Version: 4.7.2 +Name: doca-sosreport +Version: 4.8.0 Release: 1%{?dist} -Source0: https://github.com/sosreport/sos/archive/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz License: GPL-2.0-or-later BuildArch: noarch Url: https://github.com/sosreport/sos @@ -31,6 +31,8 @@ hardware and configuration. The information can then be used for diagnostic purposes and debugging. Sos is commonly used to help support technicians and developers. +%define sosname sos + %prep %setup -qn %{name}-%{version} @@ -54,21 +56,21 @@ support technicians and developers. %py3_install '--install-scripts=%{_sbindir}' %endif -install -d -m 755 %{buildroot}%{_sysconfdir}/%{name} -install -d -m 700 %{buildroot}%{_sysconfdir}/%{name}/cleaner -install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/presets.d -install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/groups.d -install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/extras.d +install -d -m 755 %{buildroot}%{_sysconfdir}/%{sosname} +install -d -m 700 %{buildroot}%{_sysconfdir}/%{sosname}/cleaner +install -d -m 755 %{buildroot}%{_sysconfdir}/%{sosname}/presets.d +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 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf -install -m 644 tmpfiles/tmpfilesd-sos-rh.conf %{buildroot}%{_tmpfilesdir}/%{name}.conf +install -m 644 %{sosname}.conf %{buildroot}%{_sysconfdir}/%{sosname}/%{sosname}.conf +install -m 644 tmpfiles/tmpfilesd-sos-rh.conf %{buildroot}%{_tmpfilesdir}/%{sosname}.conf rm -rf %{buildroot}/usr/config/ -%find_lang %{name} || echo 0 +%find_lang %{sosname} || echo 0 # internationalization is currently broken. Uncomment this line once fixed. -# %%files -f %%{name}.lang +# %%files -f %%{sosname}.lang %files %if 0%{?fedora} >= 39 %{_bindir}/sos @@ -83,7 +85,7 @@ rm -rf %{buildroot}/usr/config/ %dir /etc/sos/presets.d %dir /etc/sos/extras.d %dir /etc/sos/groups.d -%{_tmpfilesdir}/%{name}.conf +%{_tmpfilesdir}/%{sosname}.conf %{python3_sitelib}/* %{_mandir}/man1/* %{_mandir}/man5/*