[powerpc-utils] Resolves: #859222 - updated to latest upstream 1.2.14

[Filip Kocina]

commit f9a2df1056c14cd6b457fcb202387e1cd105ae50
Author: Filip Kocina <fkocina at redhat.com>
Date:   Tue Dec 18 09:31:25 2012 +0100

    Resolves: #859222 - updated to latest upstream 1.2.14

 powerpc-utils-1.2.6-man.patch |   60 +---------------------------------------
 powerpc-utils.spec            |    7 +++-
 2 files changed, 7 insertions(+), 60 deletions(-)
---
diff --git a/powerpc-utils-1.2.6-man.patch b/powerpc-utils-1.2.6-man.patch
index 3a94372..d87a927 100644
--- a/powerpc-utils-1.2.6-man.patch
+++ b/powerpc-utils-1.2.6-man.patch
@@ -151,62 +151,6 @@ diff -up powerpc-utils-1.2.6/man/lsprop.8.man powerpc-utils-1.2.6/man/lsprop.8
 +Display up to
 +.I num-words
 +words per line
-diff -up powerpc-utils-1.2.6/man/lsslot.8.man powerpc-utils-1.2.6/man/lsslot.8
---- powerpc-utils-1.2.6/man/lsslot.8.man	2011-02-03 15:42:10.827197001 +0100
-+++ powerpc-utils-1.2.6/man/lsslot.8	2010-10-05 15:04:41.000000000 +0200
-@@ -0,0 +1,52 @@
-+.TH LSSLOT "8" "Oct 2010" "Linux" "Linux on Power Service Tools"
-+.SH NAME
-+lsslot \- Utility to list DLPAR and hotplug capable slots.
-+
-+.SH SYNOPSIS
-+.B lsprop
-+.RB [ \-c " | " \-a " | " \-b " | " \-p " | " \-o " | " \-s " | " \-F " | " \-d " | " \-w ]
-+
-+.SH OVERVIEW
-+.B lsslot
-+program is a member of the ppc64-utils suite of utils.
-+Use it to list DLPAR and hotplug capable slots.
-+
-+.SH DESCRIPTION
-+.B lsslot
-+is a utility to list DLPAR and hotplug capable slots.
-+
-+.SH OPTIONS
-+.TP
-+.BI \-c " connector type"
-+Display the slots of the specified connector type.  The valid connector types
-+are "pci" for hotplg PCI slots, "slot" for logical slots, "phb" fot PHB's
-+and "cpu" for cpu's. The default is "slot" if no -c option is specified.
-+.TP
-+.B \-a
-+Display available slots, valid for "pci" slots only.
-+.TP
-+.B \-b
-+Display cpu's and caches, valid for "cpu" only.
-+.TP
-+.B \-o
-+Display occupied slots, valid for "pci" slots only.
-+.TP
-+.B \-p
-+Display caches, valid for "cpu" slots only.
-+.BI \-s " slot"
-+Display characteristics of the specified slot.
-+.TP
-+.BI \-F " delimiter"
-+Specified a single character to delimit the output. The heading is not
-+displayed and the columns are delimited by the specified character.
-+.TP
-+.B \-d
-+Enable debugging output.
-+.TP
-+.BI \-w " timeout"
-+Specify a timeout when attempting to acquire locks.
-+.SH AUTHOR
-+.B lsslot
-+was written by IBM Corporation
-+.PP
-+This manual page was written by Roman Rakus <rrakus at redhat.com>
 diff -up powerpc-utils-1.2.6/man/ls-vdev.8.man powerpc-utils-1.2.6/man/ls-vdev.8
 --- powerpc-utils-1.2.6/man/ls-vdev.8.man	2011-02-03 15:42:10.828197001 +0100
 +++ powerpc-utils-1.2.6/man/ls-vdev.8	2010-10-05 15:04:41.000000000 +0200
@@ -301,7 +245,7 @@ diff -up powerpc-utils-1.2.10/man/Makefile.am.man powerpc-utils-1.2.10/man/Makef
  	   uesensor.8 amsstat.1 serv_config.8		\
  	   update_flash.8 nvram.8 set_poweron_time.8		\
  	   usysattn.8 bootlist.8 ofpathname.8 snap.8 usysident.8	\
--	   hvcsadmin.8 rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8
+-	   hvcsadmin.8 rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 lsslot.8
 -
 +	   hvcsadmin.8 rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 \
 +	   lsdevinfo.8 rtas_event_decode.8 ls-vdev.8 lsslot.8 lsprop.8 \
@@ -313,7 +257,7 @@ diff -up powerpc-utils-1.2.10/man/Makefile.in.man powerpc-utils-1.2.10/man/Makef
  	   uesensor.8 amsstat.1 serv_config.8		\
  	   update_flash.8 nvram.8 set_poweron_time.8		\
  	   usysattn.8 bootlist.8 ofpathname.8 snap.8 usysident.8	\
--	   hvcsadmin.8 rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8
+-	   hvcsadmin.8 rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 lsslot.8
 +	   hvcsadmin.8 rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 \
 +	   lsdevinfo.8 rtas_event_decode.8 ls-vdev.8 lsslot.8 lsprop.8 \
 +	   drmgr.8 ls-veth.8 ppc64_cpu.8 nvsetenv.8 ls-vscsi.8
diff --git a/powerpc-utils.spec b/powerpc-utils.spec
index a8deb6f..d778ba7 100644
--- a/powerpc-utils.spec
+++ b/powerpc-utils.spec
@@ -1,6 +1,6 @@
 Name:           powerpc-utils
-Version:        1.2.12
-Release:        4%{?dist}
+Version:        1.2.14
+Release:        1%{?dist}
 Summary:        Utilities for PowerPC platforms
 
 Group:          System Environment/Base
@@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %preun
 
 %changelog
+* Tue Dec 18 2012 Filip Kocina <fkocina at redhat.com> 1.2.14-1
+- Resolves: #859222 - updated to latest upstream 1.2.14
+
 * Thu Dec 13 2012 Karsten Hopp <karsten at redhat.com> 1.2.12-4
 - Add multipath support to ofpathname for bug #884826