SPECS/ppc64-diag.spec

@@ -1,10 +1,15 @@
+# BZ#860040:
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}\/usr\/libexec\/ppc64-diag\/servevent_parse.pl
+
 Name:           ppc64-diag
 Version:        2.7.9
 Release:        1%{?dist}
 Summary:        PowerLinux Platform Diagnostics
-URL:            https://github.com/power-ras/%{name}
+URL:            https://github.com/power-ras/ppc64-diag
+Group:          System Environment/Base
 License:        GPLv2
 ExclusiveArch:  ppc %{power64}
+
 BuildRequires:  make
 BuildRequires:  gcc-c++
 BuildRequires:  libservicelog-devel
@@ -44,10 +49,9 @@ predictive failures, if appropriate modifies the FRUs fault
 indicator(s) and provides event notification to system
 administrators or connected service frameworks.
 
-%package        rtas
-Summary:        rtas_errd daemon
-# PCI hotplug support on PowerKVM guest depends on below powerpc-utils version.
-Requires:       powerpc-utils-core >= 1.3.7-5
+%package rtas
+Summary: rtas_errd daemon
+Requires: powerpc-utils-core >= 1.3.6-6
 
 %description rtas
 This package contains only rtas_errd daemon.
@@ -57,8 +61,8 @@ This package contains only rtas_errd daemon.
 
 %build
 ./autogen.sh
-CXXFLAGS="-std=gnu++14 %{build_cflags}" %configure
-LDFLAGS="%{build_ldflags}" CFLAGS="%{build_cflags}" CXXFLAGS="-std=gnu++14 %{build_cflags}" make %{?_smp_mflags} V=1
+%configure
+LDFLAGS="%{build_ldflags}" CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cflags}" make %{?_smp_mflags} V=1
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -69,6 +73,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/ses_pages
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/dump
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/opal-elog
+ 
 ln -sfv %{_sbindir}/usysattn $RPM_BUILD_ROOT/%{_sbindir}/usysfault
 install -m 644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT/%{_mandir}/man8/
 
@@ -127,18 +132,18 @@ install -m 644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD
 %{_libexecdir}/%{name}/lp_diag_setup --register >/dev/null 2>&1
 %{_libexecdir}/%{name}/ppc64_diag_setup --register >/dev/null 2>&1
 if [ "$1" = "1" ]; then # first install
-    systemctl -q enable opal_errd.service >/dev/null
-    systemctl start opal_errd.service >/dev/null
+    systemctl -q enable opal_errd.service >/dev/null 2>&1
+    systemctl start opal_errd.service >/dev/null 2>&1
 elif [ "$1" = "2" ]; then # upgrade
-    systemctl restart opal_errd.service >/dev/null
+    systemctl restart opal_errd.service >/dev/null 2>&1
     systemctl daemon-reload > /dev/null 2>&1
 fi
 
 %preun
 # Pre-uninstall script -------------------------------------------------
 if [ "$1" = "0" ]; then # last uninstall
-    systemctl stop opal_errd.service >/dev/null
-    systemctl -q disable opal_errd.service
+    systemctl stop opal_errd.service >/dev/null 2>&1
+    systemctl -q disable opal_errd.service >/dev/null 2>&1
     %{_libexecdir}/%{name}/ppc64_diag_setup --unregister >/dev/null
     %{_libexecdir}/%{name}/lp_diag_setup --unregister >/dev/null
     systemctl daemon-reload > /dev/null 2>&1
@@ -147,11 +152,10 @@ fi
 %triggerin -- librtas
 # trigger on librtas upgrades ------------------------------------------
 if [ "$2" = "2" ]; then
-    systemctl restart opal_errd.service >/dev/null
-    systemctl restart rtas_errd.service >/dev/null
+    systemctl restart opal_errd.service >/dev/null 2>&1
+    systemctl restart rtas_errd.service >/dev/null 2>&1
 fi
 
- 
 %post rtas
 if [ "$1" = "1" ]; then # first install
     systemctl -q enable rtas_errd.service >/dev/null
@@ -169,64 +173,39 @@ if [ "$1" = "0" ]; then # last uninstall
 fi
 
 %changelog
-* Tue Oct 18 2022 Than Ngo <than@redhat.com> - 2.7.9-1
-- Resolves: #2110128, add NVMe Call Home support
-
-* Fri May 06 2022 Than Ngo <than@redhat.com> - 2.7.8-1
-- Resolves: #2051286, rebase to 2.7.8
+* Wed Oct 19 2022 Than Ngo <than@redhat.com> - 2.7.9-1
+- Resolves: #2114591, rebase to 2.7.9
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.7-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Fri May 13 2022 Than Ngo <than@redhat.com> - 2.7.8-1
+- Resolves: #2051313, rebase to 2.7.8
 
 * Mon May 17 2021 Than Ngo <than@redhat.com> - 2.7.7-1
-- Resolves: #1869567, rebase to 2.7.7
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.6-10
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.6-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Oct 27 2020 Jeff Law <law@redhat.com> - 2.7.6-8
-- Force C++14 for configure step too
-
-* Tue Oct 27 2020 Jeff Law <law@redhat.com> - 2.7.6-7
-- Force C++14 mode as this code is not C++17 ready
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.6-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Mar 30 2020 Than Ngo <than@redhat.com> - 2.7.6-5
-- add requirement on powerpc-utils in main package
-
-* Sat Mar 28 2020 Than Ngo <than@redhat.com> - 2.7.6-4
-- create rtas subpackage to avoid the perl dependency
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+- Resolves: #1779206, rebase to 2.7.7
 
-* Mon Dec 02 2019 Than Ngo <than@redhat.com> - 2.7.6-2
-- Update Url and Source
+* Thu Mar 26 2020 Than Ngo <than@redhat.com> - 2.7.6-2
+- Resolves: #1814335, create rtas subpackage to avoid the perl dependency
 
-* Wed Nov 27 2019 Than Ngo <than@redhat.com> - 2.7.6-1
-- rebase to 2.7.6
-- update Url
+* Thu Nov 07 2019 Than Ngo <than@redhat.com> - 2.7.6-1
+- Resolves: #1725200, rebase to 2.7.6
 
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Wed Jun 19 2019 Than Ngo <than@redhat.com> - 2.7.5-2
+- Resolves: #1721497, added /var/log/ppc64-diag and systemctl daemon-reload
 
-* Thu Apr 25 2019 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 2.7.5-1
-- Update to latest upstream 2.7.5
+* Tue Apr 30 2019 Than Ngo <than@redhat.com> - 2.7.5-1
+- Resolves: #1664093, update to latest upstream 2.7.5
 
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Mon Dec 10 2018 Than Ngo <than@redhat.com> - 2.7.4-4
+- install missing man pages
 
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Mon Dec 10 2018 Than Ngo <than@redhat.com> - 2.7.4-3
+- create diag_disk path part of installation
+- diags: Increase buffer length size to read complete system vpd information
+- diags: Remove timestamp from disk health log file
+- diags: Create diag_disk log directory manually if not present
+  Resolves: #1657757
 
 * Thu May 10 2018 Dan Horák <dan[at]danny.cz> - 2.7.4-2
-- fix condition for rtas_errd service (#1575638)
+- fix conditition for rtas_errd service (#1575638)
 
 * Fri Mar 09 2018 Than Ngo <than@redhat.com> - 2.7.4-1
 - update to latest upstream 2.7.4