[ppc64-diag] Update to latest upstream 2.6.1

[Vasant Hegde]

commit e9f8bfd59e682cca05662d1f08c8d1168a860930
Author: Vasant Hegde <hegdevasant at linux.vnet.ibm.com>
Date:   Mon May 20 22:19:41 2013 +0530

    Update to latest upstream 2.6.1

 .gitignore      |    1 +
 ppc64-diag.spec |   41 ++++++++++++++++++++++++++++-------------
 sources         |    2 +-
 3 files changed, 30 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4726333..5412909 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /ppc64-diag-2.4.2.tar.gz
 /ppc64-diag-2.4.3.tar.gz
+/ppc64-diag-2.6.1.tar.gz
diff --git a/ppc64-diag.spec b/ppc64-diag.spec
index 76bdcc5..bbed4fd 100644
--- a/ppc64-diag.spec
+++ b/ppc64-diag.spec
@@ -1,7 +1,7 @@
 Name:           ppc64-diag
-Version:        2.4.3
-Release:        7%{?dist}
-Summary:        Linux for Power Platform Diagnostics
+Version:        2.6.1
+Release:        1%{?dist}
+Summary:        PowerLinux Platform Diagnostics
 URL:            http://sourceforge.net/projects/linux-diag/files/ppc64-diag/
 Group:          System Environment/Base
 License:        EPL
@@ -9,22 +9,27 @@ ExclusiveArch:  ppc ppc64
 BuildRequires:  libservicelog-devel, flex, perl, byacc, librtas-devel
 BuildRequires:  libvpd-devel, systemd-units
 Requires:       servicelog, lsvpd
+# PRRN RTAS event notification handler depends on below librtas
+# and powerpc-utils versions.
+Requires:	librtas >= 1.3.8
+Requires:	powerpc-utils >= 1.2.16
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/%{version}/%{name}-%{version}.tar.gz
 Source1:        rtas_errd.service
 Patch0:         ppc64-diag-2.4.2-messagecatalog-location.patch
 Patch1:         ppc64-diag-2.4.2-chkconfig.patch
 Patch2:         ppc64-diag-2.4.3-scriptlocation.patch
-Patch3:         ppc64-diag-unistd.patch
-Patch4:         ppc64-diag-unusedvar.patch
+Patch3:         ppc64-diag-unusedvar.patch
 
 %description
-Platform diagnostics for Linux for Power writes events reported by the
-System p or System i platform firmware to the service log, provides automated
-responses to urgent events such as environmental conditions and predictive
-failures, and provides notifications of the event to system administrators
-or connected service frameworks.  Some error log analysis parameters can be
-configured in /etc/ppc64-diag/ppc64-diag.config.
+This package contains various diagnostic tools for PowerLinux.
+These tools captures the diagnostic events from Power Systems
+platform firmware, SES enclosures and device drivers, and
+write events to servicelog database. It also provides automated
+responses to urgent events such as environmental conditions and
+predictive failures, if appropriate modifies the FRUs fault
+indicator(s) and provides event notification to system
+administrators or connected service frameworks.
 
 # BZ#860040:
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}\/usr\/libexec\/ppc64-diag\/servevent_parse.pl
@@ -34,8 +39,7 @@ configured in /etc/ppc64-diag/ppc64-diag.config.
 %patch0 -p1 -b .msg_loc
 %patch1 -p1 -b .chkconfig
 %patch2 -p1 -b .script_loc
-%patch3 -p1 -b .unistd
-%patch4 -p1 -b .unusevar
+%patch3 -p1 -b .unusevar
 
 %build
 make %{?_smp_mflags}
@@ -48,6 +52,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/%{name}
 mv -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/rtas_errd $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/
 mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}
+mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/ses_pages
+ln -sfv %{_sbindir}/usysattn $RPM_BUILD_ROOT/%{_sbindir}/usysfault
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,8 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr (-,root,root,-)
 %doc COPYRIGHT
 %dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/ses_pages
 %{_mandir}/man8/*
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/%{name}/ppc64-diag.config
+%attr(744,root,root) %{_sysconfdir}/%{name}/prrn_hotplug
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_datadir}/%{name}
 %dir %attr(755,root,root) %{_datadir}/%{name}/message_catalog/
@@ -66,6 +74,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/%{name}/ppc64_diag_notify
 #%attr(755,root,root) %{_libexecdir}/%{name}/ppc64_diag_servagent
 %attr(755,root,root) %{_libexecdir}/%{name}/ppc64_diag_setup
+%attr(755,root,root) %{_libexecdir}/%{name}/lp_diag_setup
+%attr(755,root,root) %{_libexecdir}/%{name}/lp_diag_notify
 %attr(644,root,root) %{_libexecdir}/%{name}/servevent_parse.pl
 %attr(644,root,root) %{_datadir}/%{name}/message_catalog/cxgb3
 %attr(644,root,root) %{_datadir}/%{name}/message_catalog/e1000e
@@ -79,6 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 # Post-install script --------------------------------------------------
+%{_libexecdir}/%{name}/lp_diag_setup --register >/dev/null
 %{_libexecdir}/%{name}/ppc64_diag_setup --register >/dev/null
 if [ "$1" = "1" ]; then # first install
     systemctl -q enable rtas_errd.service
@@ -93,6 +104,7 @@ if [ "$1" = "0" ]; then # last uninstall
     systemctl stop rtas_errd.service
     systemctl -q disable rtas_errd.service
     %{_libexecdir}/%{name}/ppc64_diag_setup --unregister >/dev/null
+    %{_libexecdir}/%{name}/lp_diag_setup --unregister >/dev/null
 fi
 
 %triggerin -- librtas
@@ -103,6 +115,9 @@ fi
 
 
 %changelog
+* Mon May 20 2013 Vasant Hegde <hegdevasant at linux.vnet.ibm.com> - 2.6.1
+- Update to latest upstream 2.6.1
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 8e16c92..7b86c7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bfcd5dfeed69201a4341938d26ae079  ppc64-diag-2.4.3.tar.gz
+5905899657dad48016fbf1e79fb93766  ppc64-diag-2.6.1.tar.gz