[lsvpd/f16] fixes #752244 - similar output for different options in lsmcode

[Jiri Skala]

commit e5816462c22b5a0701b0afa91c65fca9f5816290
Author: Jiri Skala <jskala at redhat.com>
Date:   Wed Nov 9 09:01:10 2011 +0100

    fixes #752244 - similar output for different options in lsmcode

 lsvpd-1.6.11-lsmopts.patch |   66 ++++++++++++++++++++++++++++++++++++++++++++
 lsvpd.spec                 |    7 ++++-
 2 files changed, 72 insertions(+), 1 deletions(-)
---
diff --git a/lsvpd-1.6.11-lsmopts.patch b/lsvpd-1.6.11-lsmopts.patch
new file mode 100644
index 0000000..fda045c
--- /dev/null
+++ b/lsvpd-1.6.11-lsmopts.patch
@@ -0,0 +1,66 @@
+diff -up lsvpd-1.6.11/docs/lsmcode.8.lsmopts lsvpd-1.6.11/docs/lsmcode.8
+--- lsvpd-1.6.11/docs/lsmcode.8.lsmopts	2011-11-09 08:13:41.602999977 +0100
++++ lsvpd-1.6.11/docs/lsmcode.8	2011-11-09 08:15:44.169000483 +0100
+@@ -24,7 +24,7 @@ lsmcode \- list microcode and firmware l
+ .ad l
+ .hy 0
+ .HP 8
+-\fBlsmcode\fR [\fB\-A\fR | \fB\-\-All\fR | \fB\-d<name>\fR | \fB\-\-device=<name>\fR] [\fB\-r\fR | \fB\-\-tabular\fR | \fB\-c\fR | \fB\-\-no\-menus\fR] [\fB\-p<database\-file>\fR | \fB\-\-path=<database\-file>\fR | \fB\-z<database\-archive>\fR | \fB\-\-zip=<database\-archive>\fR] [\fB\-h\fR | \fB\-\-help\fR]
++\fBlsmcode\fR [\fB\-A\fR | \fB\-\-All\fR | \fB\-d<name>\fR | \fB\-\-device=<name>\fR] [\fB\-p<database\-file>\fR | \fB\-\-path=<database\-file>\fR | \fB\-z<database\-archive>\fR | \fB\-\-zip=<database\-archive>\fR] [\fB\-h\fR | \fB\-\-help\fR]
+ .ad
+ .hy
+ 
+@@ -50,14 +50,6 @@ Display information for all supported ha
+ Only show configuration information for the component with the given \fIname\fR\&.
+ 
+ .TP
+-\-r|\-\-tabluar
+-Display information in a tabular format\&. Overrides \fI\-c\fR\&.
+-
+-.TP
+-\-c|\-\-no\-menus
+-Display information without using menus\&. This is only included for compatibility with calling software that expects to be able to use the same options as for the AIX version, since interactive menus are not supported in this version\&.
+-
+-.TP
+ \-p<database\-file>|\-\-path=<database\-file>
+ Use <database\-file> as the hardware inventory database, rather then the default file\&. Note the supplied filename must include a full path\&. (\fI/var/lib/lsvpd/db\fR)\&.
+ 
+diff -up lsvpd-1.6.11/src/output/lsmcode.cpp.lsmopts lsvpd-1.6.11/src/output/lsmcode.cpp
+--- lsvpd-1.6.11/src/output/lsmcode.cpp.lsmopts	2010-07-02 20:54:08.000000000 +0200
++++ lsvpd-1.6.11/src/output/lsmcode.cpp	2011-11-09 08:07:18.581000751 +0100
+@@ -66,8 +66,6 @@ void printUsage( )
+ 	cout << " --help,       -h     print this usage message" << endl;
+ 	cout << " --debug,      -D     print extra information about devices (sysfs locations, etc)" << endl;
+ 	cout << " --version,    -v     print the version of vpd tools" << endl;
+-	cout << " --no-menus,   -c     Do not use menus.  This is the default (no menus implemented)." << endl;
+-	cout << " --tabular,    -r     Use a tabular format.  Overrides -c." << endl;
+ 	cout << " --All,        -A     Display microcode level for as many devices as possible." << endl;
+ 	cout << "                      this implies -r." << endl;
+ 	cout << " --device=DEV, -dDEV  Only display microcode level for specified device (DEV)." << endl;
+@@ -249,8 +247,6 @@ int main( int argc, char** argv )
+ 	{
+ 		{ "help", 0, 0, 'h' },
+ 		{ "version", 0, 0, 'v' },
+-		{ "no-menus", 0, 0, 'c' },
+-		{ "tabular", 0, 0, 'r' },
+ 		{ "All", 0, 0, 'A' },
+ 		{ "device", 1, 0, 'd' },
+ 		{ "path", 1, 0, 'p' },
+@@ -268,17 +264,10 @@ int main( int argc, char** argv )
+ 	{
+ 		switch( getopt_long( argc, argv, opts, longOpts, &index ) )
+ 		{
+-			case 'c':
+-				break;
+-
+ 			case 'v':
+ 				printVersion( );
+ 				return 0;
+ 
+-			case 'r':
+-				tabular = true;
+-				break;
+-
+ 			case 'A':
+ 				all = true;
+ 				tabular = true;
diff --git a/lsvpd.spec b/lsvpd.spec
index 67d6292..40bf92b 100644
--- a/lsvpd.spec
+++ b/lsvpd.spec
@@ -3,7 +3,7 @@
 
 Name:		%{name}
 Version:	%{version}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	VPD/hardware inventory utilities for Linux
 
 Group:		Applications/System
@@ -12,6 +12,7 @@ URL:		http://linux-diag.sf.net/Lsvpd.html
 Source0:	http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
 Patch1:		lsvpd-1.6.7-ids-lookup.patch
 Patch2:		lsvpd-1.6.10-sg3_utils.patch
+Patch3:		lsvpd-1.6.11-lsmopts.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libvpd-devel >= 2.1.3
 BuildRequires:	sg3_utils-devel zlib-devel automake libtool
@@ -40,6 +41,7 @@ on POWER PC based systems.
 %setup -q
 %patch1 -p0 -b .lookup
 %patch2 -p1 -b .sg3_utils
+%patch3 -p1 -b .lsmopts
 
 %build
 ./bootstrap.sh
@@ -73,6 +75,9 @@ on POWER PC based systems.
 %dir %{_sysconfdir}/lsvpd
 
 %changelog
+* Wed Nov 09 2011 Jiri Skala <jskala at redhat.com> - 1.6.11-2
+- fixes #752244 - similar output for different options in lsmcode
+
 * Wed Aug 24 2011 Jiri Skala <jskala at redhat.com> - 1.6.11-1
 - rebase to latest upstream 1.6.11