[ppc64-diag/f17] update to 2.4.3

Karsten Hopp karsten at fedoraproject.org
Fri May 4 13:53:05 UTC 2012 

commit 40f20362c528dd5d80dc81c19c39e03969da8648
Author: Karsten Hopp <karsten at redhat.com>
Date:   Fri May 4 15:52:40 2012 +0200

    update to 2.4.3

 .gitignore                                         |    1 +
 ....patch => ppc64-diag-2.4.3-scriptlocation.patch |   43 +++++++++-----------
 ppc64-diag.spec                                    |   11 +++--
 sources                                            |    2 +-
 4 files changed, 28 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ffcec6..4726333 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ppc64-diag-2.4.2.tar.gz
+/ppc64-diag-2.4.3.tar.gz
diff --git a/ppc64-diag-2.4.2-scriptlocation.patch b/ppc64-diag-2.4.3-scriptlocation.patch
similarity index 62%
rename from ppc64-diag-2.4.2-scriptlocation.patch
rename to ppc64-diag-2.4.3-scriptlocation.patch
index 58be58a..b11ae1b 100644
--- a/ppc64-diag-2.4.2-scriptlocation.patch
+++ b/ppc64-diag-2.4.3-scriptlocation.patch
@@ -1,6 +1,6 @@
-diff -up ppc64-diag-2.4.2/scripts/Makefile.scriptloc ppc64-diag-2.4.2/scripts/Makefile
---- ppc64-diag-2.4.2/scripts/Makefile.scriptloc	2011-09-05 05:58:06.720541401 -0400
-+++ ppc64-diag-2.4.2/scripts/Makefile	2009-05-21 17:33:06.000000000 -0400
+diff -up ppc64-diag-2.4.3/scripts/Makefile.script_loc ppc64-diag-2.4.3/scripts/Makefile
+--- ppc64-diag-2.4.3/scripts/Makefile.script_loc	2012-02-14 06:53:59.000000000 +0100
++++ ppc64-diag-2.4.3/scripts/Makefile	2012-05-04 15:32:55.186608517 +0200
 @@ -12,12 +12,12 @@ CFG_FILES = ppc64-diag.config
  all: $(SCRIPTS) $(INIT_FILES) $(CFG_FILES)
  
@@ -16,9 +16,9 @@ diff -up ppc64-diag-2.4.2/scripts/Makefile.scriptloc ppc64-diag-2.4.2/scripts/Ma
  	@$(call uninstall_files,$(INIT_FILES),$(DESTDIR)/etc/init.d)
  	@$(call uninstall_files,$(CFG_FILES),$(DESTDIR)/etc/ppc64-diag)
  
-diff -up ppc64-diag-2.4.2/scripts/ppc64_diag_mkrsrc.scriptloc ppc64-diag-2.4.2/scripts/ppc64_diag_mkrsrc
---- ppc64-diag-2.4.2/scripts/ppc64_diag_mkrsrc.scriptloc	2011-09-05 06:04:22.481785543 -0400
-+++ ppc64-diag-2.4.2/scripts/ppc64_diag_mkrsrc	2011-09-05 06:02:45.519756640 -0400
+diff -up ppc64-diag-2.4.3/scripts/ppc64_diag_mkrsrc.script_loc ppc64-diag-2.4.3/scripts/ppc64_diag_mkrsrc
+--- ppc64-diag-2.4.3/scripts/ppc64_diag_mkrsrc.script_loc	2012-01-20 00:53:34.000000000 +0100
++++ ppc64-diag-2.4.3/scripts/ppc64_diag_mkrsrc	2012-05-04 15:32:55.186608517 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/perl -I /etc/ppc64-diag
 +#! /usr/bin/perl -I /usr/libexec/ppc64-diag
@@ -34,9 +34,9 @@ diff -up ppc64-diag-2.4.2/scripts/ppc64_diag_mkrsrc.scriptloc ppc64-diag-2.4.2/s
  
  # Check to make sure that devices.chrp.base.ServiceRM is installed
  $check = `/bin/rpm -q devices.chrp.base.ServiceRM 2>/dev/null`;
-diff -up ppc64-diag-2.4.2/scripts/ppc64_diag_notify.scriptloc ppc64-diag-2.4.2/scripts/ppc64_diag_notify
---- ppc64-diag-2.4.2/scripts/ppc64_diag_notify.scriptloc	2011-09-05 06:04:37.194638501 -0400
-+++ ppc64-diag-2.4.2/scripts/ppc64_diag_notify	2011-09-05 06:01:43.164377573 -0400
+diff -up ppc64-diag-2.4.3/scripts/ppc64_diag_notify.script_loc ppc64-diag-2.4.3/scripts/ppc64_diag_notify
+--- ppc64-diag-2.4.3/scripts/ppc64_diag_notify.script_loc	2011-11-08 00:51:25.000000000 +0100
++++ ppc64-diag-2.4.3/scripts/ppc64_diag_notify	2012-05-04 15:32:55.186608517 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/perl -I /etc/ppc64-diag
 +#! /usr/bin/perl -I /usr/libexec/ppc64-diag
@@ -52,9 +52,9 @@ diff -up ppc64-diag-2.4.2/scripts/ppc64_diag_notify.scriptloc ppc64-diag-2.4.2/s
  
  sub usage {
  	print "$0 [OPTIONS]\n";
-diff -up ppc64-diag-2.4.2/scripts/ppc64_diag_servagent.scriptloc ppc64-diag-2.4.2/scripts/ppc64_diag_servagent
---- ppc64-diag-2.4.2/scripts/ppc64_diag_servagent.scriptloc	2011-09-05 06:04:45.922549428 -0400
-+++ ppc64-diag-2.4.2/scripts/ppc64_diag_servagent	2011-09-05 06:02:34.317866330 -0400
+diff -up ppc64-diag-2.4.3/scripts/ppc64_diag_servagent.script_loc ppc64-diag-2.4.3/scripts/ppc64_diag_servagent
+--- ppc64-diag-2.4.3/scripts/ppc64_diag_servagent.script_loc	2011-11-08 00:51:25.000000000 +0100
++++ ppc64-diag-2.4.3/scripts/ppc64_diag_servagent	2012-05-04 15:32:55.186608517 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/perl -I /etc/ppc64-diag
 +#! /usr/bin/perl -I /usr/libexec/ppc64-diag
@@ -70,10 +70,10 @@ diff -up ppc64-diag-2.4.2/scripts/ppc64_diag_servagent.scriptloc ppc64-diag-2.4.
  
  if (!-e "/usr/svcagent/bin/callsa2") {
  	# eSA is not installed; exit quietly
-diff -up ppc64-diag-2.4.2/scripts/ppc64_diag_setup.scriptloc ppc64-diag-2.4.2/scripts/ppc64_diag_setup
---- ppc64-diag-2.4.2/scripts/ppc64_diag_setup.scriptloc	2011-09-05 06:05:06.033350396 -0400
-+++ ppc64-diag-2.4.2/scripts/ppc64_diag_setup	2011-09-05 06:00:35.584058181 -0400
-@@ -76,19 +76,19 @@ sub unregister {
+diff -up ppc64-diag-2.4.3/scripts/ppc64_diag_setup.script_loc ppc64-diag-2.4.3/scripts/ppc64_diag_setup
+--- ppc64-diag-2.4.3/scripts/ppc64_diag_setup.script_loc	2012-02-14 06:53:59.000000000 +0100
++++ ppc64-diag-2.4.3/scripts/ppc64_diag_setup	2012-05-04 15:34:23.960384271 +0200
+@@ -76,15 +76,15 @@ sub unregister {
  
  @notification_tools = (
  
@@ -87,19 +87,14 @@ diff -up ppc64-diag-2.4.2/scripts/ppc64_diag_setup.scriptloc ppc64-diag-2.4.2/sc
       "--match='serviceable=1' ".
       "--type=EVENT --method=pairs_stdin"],
  
--    ["/etc/ppc64-diag/ppc64_diag_servagent",
-+    ["/usr/libexec/ppc64-diag/ppc64_diag_servagent",
-      "--match='serviceable=1 and (type=2 or type=3)' ".
-      "--type=EVENT --method=pairs_stdin"],
- 
 -    ["/etc/ppc64-diag/ppc64_diag_migrate",
 +    ["/usr/libexec/ppc64-diag/ppc64_diag_migrate",
       "--match=\'refcode=\"#MIGRATE\" and serviceable=0\' ".
       "--type=EVENT --method=pairs_stdin"],
  );
-diff -up ppc64-diag-2.4.2/scripts/rtas_errd.scriptloc ppc64-diag-2.4.2/scripts/rtas_errd
---- ppc64-diag-2.4.2/scripts/rtas_errd.scriptloc	2011-09-05 05:59:14.982858075 -0400
-+++ ppc64-diag-2.4.2/scripts/rtas_errd	2011-09-05 05:59:34.531662814 -0400
+diff -up ppc64-diag-2.4.3/scripts/rtas_errd.script_loc ppc64-diag-2.4.3/scripts/rtas_errd
+--- ppc64-diag-2.4.3/scripts/rtas_errd.script_loc	2012-05-04 15:32:55.173608987 +0200
++++ ppc64-diag-2.4.3/scripts/rtas_errd	2012-05-04 15:32:55.187608480 +0200
 @@ -49,7 +49,7 @@ case "$1" in
  		echo "registering ppc64-diag with system"
  		rm -f /var/cache/ppc64-diag.registered
diff --git a/ppc64-diag.spec b/ppc64-diag.spec
index 522b5f4..287dafd 100644
--- a/ppc64-diag.spec
+++ b/ppc64-diag.spec
@@ -1,6 +1,6 @@
 Name:           ppc64-diag
-Version:        2.4.2
-Release:        5%{?dist}
+Version:        2.4.3
+Release:        1%{?dist}
 Summary:        Linux for Power Platform Diagnostics
 URL:            http://sourceforge.net/projects/linux-diag/files/ppc64-diag/
 Group:          System Environment/Base
@@ -14,7 +14,7 @@ Source0:        http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/%
 Source1:        ppc64-diag.service
 Patch0:         ppc64-diag-2.4.2-messagecatalog-location.patch
 Patch1:         ppc64-diag-2.4.2-chkconfig.patch
-Patch2:         ppc64-diag-2.4.2-scriptlocation.patch
+Patch2:         ppc64-diag-2.4.3-scriptlocation.patch
 Patch3:         ppc64-diag-unistd.patch
 Patch4:         ppc64-diag-unusedvar.patch
 
@@ -61,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/%{name}/ppc64_diag_migrate
 %attr(755,root,root) %{_libexecdir}/%{name}/ppc64_diag_mkrsrc
 %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_servagent
 %attr(755,root,root) %{_libexecdir}/%{name}/ppc64_diag_setup
 %attr(644,root,root) %{_libexecdir}/%{name}/servevent_parse.pl
 %attr(644,root,root) %{_datadir}/%{name}/message_catalog/cxgb3
@@ -96,6 +96,9 @@ fi
 
 
 %changelog
+* Fri May 04 2012 Karsten Hopp <karsten at redhat.com> 2.4.3-1
+- update to 2.4.3
+
 * Wed Feb 15 2012 Karsten Hopp <karsten at redhat.com> 2.4.2-5
 - don't strip binaries
 - fix some build issues
diff --git a/sources b/sources
index 91f3c61..8e16c92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a6425e3d1fff74fdda4335136196eecf  ppc64-diag-2.4.2.tar.gz
+2bfcd5dfeed69201a4341938d26ae079  ppc64-diag-2.4.3.tar.gz

More information about the scm-commits mailing list