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

[Jiri Skala]

commit efe5f181d9e85730f914df0297b001d590ea32e9
Author: Jiri Skala <jskala at redhat.com>
Date:   Wed Nov 9 07:35:22 2011 +0100

    fixes #752244 - similar output for different options in lsmcode

 lsvpd-1.6.11-lsmopts.patch |   20 ++++++++++++++++++++
 lsvpd.spec                 |    7 ++++++-
 2 files changed, 26 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..67a6b0b
--- /dev/null
+++ b/lsvpd-1.6.11-lsmopts.patch
@@ -0,0 +1,20 @@
+--- lsvpd-1.6.8.org/src/output/lsmcode.cpp	2011-09-08 14:36:37.000000000 -0400
++++ lsvpd-1.6.8/src/output/lsmcode.cpp	2011-09-08 14:42:24.000000000 -0400
+@@ -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' },
diff --git a/lsvpd.spec b/lsvpd.spec
index a90229e..f5f58f6 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 10 2011 Jiri Skala <jskala at redhat.com> - 1.6.11-1
 - rebase to latest upstream 1.6.11