From 194eee699903db0651cd51c745cb3305d8156548 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 4 May 2012 16:54:35 +0200 Subject: [PATCH] drop obsolete patch --- lsvpd-1.6.11-lsmopts.patch | 66 -------------------------------------- lsvpd.spec | 2 -- 2 files changed, 68 deletions(-) delete mode 100644 lsvpd-1.6.11-lsmopts.patch diff --git a/lsvpd-1.6.11-lsmopts.patch b/lsvpd-1.6.11-lsmopts.patch deleted file mode 100644 index fda045c..0000000 --- a/lsvpd-1.6.11-lsmopts.patch +++ /dev/null @@ -1,66 +0,0 @@ -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\fR | \fB\-\-device=\fR] [\fB\-r\fR | \fB\-\-tabular\fR | \fB\-c\fR | \fB\-\-no\-menus\fR] [\fB\-p\fR | \fB\-\-path=\fR | \fB\-z\fR | \fB\-\-zip=\fR] [\fB\-h\fR | \fB\-\-help\fR] -+\fBlsmcode\fR [\fB\-A\fR | \fB\-\-All\fR | \fB\-d\fR | \fB\-\-device=\fR] [\fB\-p\fR | \fB\-\-path=\fR | \fB\-z\fR | \fB\-\-zip=\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|\-\-path= - Use 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 a054904..5ba5a6f 100644 --- a/lsvpd.spec +++ b/lsvpd.spec @@ -12,7 +12,6 @@ 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.12-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 @@ -41,7 +40,6 @@ on POWER PC based systems. %setup -q %patch1 -p0 -b .lookup %patch2 -p1 -b .sg3_utils -%patch3 -p1 -b .lsmopts %build ./bootstrap.sh