From 42b1b2100059f8c95004b9192693fec6bda9b558 Mon Sep 17 00:00:00 2001
From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: May 21 2013 05:52:42 +0000
Subject: Fix lpd script location issue.


---

diff --git a/ppc64-diag-2.6.1-lpdscriptloc.patch b/ppc64-diag-2.6.1-lpdscriptloc.patch
new file mode 100644
index 0000000..aef6529
--- /dev/null
+++ b/ppc64-diag-2.6.1-lpdscriptloc.patch
@@ -0,0 +1,49 @@
+diff --git a/lpd/scripts/Makefile b/lpd/scripts/Makefile
+index d028d09..9cb1ae5 100644
+--- a/lpd/scripts/Makefile
++++ b/lpd/scripts/Makefile
+@@ -8,9 +8,9 @@ SCRIPTS = lp_diag_setup lp_diag_notify
+ all: $(SCRIPTS)
+ 
+ install: all
+-	@$(call install_files,$(SCRIPTS),744,$(DESTDIR)/etc/ppc64-diag)
++	@$(call install_files,$(SCRIPTS),744,$(DESTDIR)/usr/libexec/ppc64-diag)
+ 
+ uninstall:
+-	@$(call uninstall_files,$(SCRIPTS),$(DESTDIR)/etc/ppc64-diag)
++	@$(call uninstall_files,$(SCRIPTS),$(DESTDIR)/usr/libexec/ppc64-diag)
+ 
+ clean:
+diff --git a/lpd/scripts/lp_diag_notify b/lpd/scripts/lp_diag_notify
+index 9cb9b04..fb67138 100755
+--- a/lpd/scripts/lp_diag_notify
++++ b/lpd/scripts/lp_diag_notify
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -I /etc/ppc64-diag
++#!/usr/bin/perl -I /usr/libexec/ppc64-diag
+ # @file		lp_diag_notify
+ #
+ # This script is to be registered with servicelog as a notification tool.
+diff --git a/lpd/scripts/lp_diag_setup b/lpd/scripts/lp_diag_setup
+index 7d7cc94..acbe05a 100755
+--- a/lpd/scripts/lp_diag_setup
++++ b/lpd/scripts/lp_diag_setup
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -I /etc/ppc64-diag
++#!/usr/bin/perl -I /usr/libexec/ppc64-diag
+ # @file		lp_diag_setup
+ # @brief	Register/unregister Light Path notification tools
+ #		with servicelog
+@@ -78,10 +78,10 @@ sub unregister {
+ }
+ 
+ @notification_tools = (
+-    ["/etc/ppc64-diag/lp_diag_notify -e",
++    ["/usr/libexec/ppc64-diag/lp_diag_notify -e",
+      "--match='disposition>=1 and severity>=4 and serviceable=1' ".
+      "--type=EVENT --method=num_arg"],
+-    ["/etc/ppc64-diag/lp_diag_notify -r",
++    ["/usr/libexec/ppc64-diag/lp_diag_notify -r",
+      "--type=REPAIR --method=num_arg"],
+ );
+ 
diff --git a/ppc64-diag.spec b/ppc64-diag.spec
index 657e77e..859f743 100644
--- a/ppc64-diag.spec
+++ b/ppc64-diag.spec
@@ -21,6 +21,7 @@ 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-unusedvar.patch
+Patch4:         ppc64-diag-2.6.1-lpdscriptloc.patch
 
 %description
 This package contains various diagnostic tools for PowerLinux.
@@ -41,6 +42,7 @@ administrators or connected service frameworks.
 %patch1 -p1 -b .chkconfig
 %patch2 -p1 -b .script_loc
 %patch3 -p1 -b .unusevar
+%patch4 -p1 -b .lpdscriptloc
 
 %build
 make %{?_smp_mflags}
@@ -116,6 +118,10 @@ fi
 
 
 %changelog
+* Tue May 21 2013 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 2.6.1-2
+* Add ncurses-devel as build dependency
+* Fix script location issue
+
 * Mon May 20 2013 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 2.6.1
 - Update to latest upstream 2.6.1