From 4251ddb92167513dac81a4706927d06e2ecdc699370a03b07e2481f3cd33e84b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 5 Feb 2020 08:40:10 +0000 Subject: [PATCH] - Fix bsc#1162690: * lshw-add-notime-option-to-manpage.patch OBS-URL: https://build.opensuse.org/package/show/hardware/lshw?expand=0&rev=32 --- lshw-add-notime-option-to-manpage.patch | 39 +++++++++++++++++++++++++ lshw.changes | 6 ++++ lshw.spec | 13 ++++----- 3 files changed, 50 insertions(+), 8 deletions(-) create mode 100644 lshw-add-notime-option-to-manpage.patch diff --git a/lshw-add-notime-option-to-manpage.patch b/lshw-add-notime-option-to-manpage.patch new file mode 100644 index 0000000..fdc73cf --- /dev/null +++ b/lshw-add-notime-option-to-manpage.patch @@ -0,0 +1,39 @@ +From 53d80a099d9b607f6104e4010f02d642decfa588 Mon Sep 17 00:00:00 2001 +From: Brahadambal Srinivasan +Date: Mon, 23 Dec 2019 11:59:39 +0530 +Subject: [PATCH] add notime option to manpage + +lshw man page and --help are not in sync and the 'notime' option +is not present in man page. + +This patch adds the option in the manpages. + +Signed-off-by: Brahadambal Srinivasan +--- + src/lshw.1 | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/lshw.1 b/src/lshw.1 +index 79c3619..31ff77f 100644 +--- a/src/lshw.1 ++++ b/src/lshw.1 +@@ -10,7 +10,7 @@ lshw \- list hardware + .sp + \fBlshw\fR [ \fB-X\fR ] + .sp +-\fBlshw\fR [ \fB [ -html ] [ -short ] [ -xml ] [ -json ] [ -businfo ] \fR ] [ \fB-dump \fIfilename\fB\fR ] [ \fB-class \fIclass\fB\fR\fI...\fR ] [ \fB-disable \fItest\fB\fR\fI...\fR ] [ \fB-enable \fItest\fB\fR\fI...\fR ] [ \fB-sanitize\fR ] [ \fB-numeric\fR ] [ \fB-quiet\fR ] ++\fBlshw\fR [ \fB [ -html ] [ -short ] [ -xml ] [ -json ] [ -businfo ] \fR ] [ \fB-dump \fIfilename\fB\fR ] [ \fB-class \fIclass\fB\fR\fI...\fR ] [ \fB-disable \fItest\fB\fR\fI...\fR ] [ \fB-enable \fItest\fB\fR\fI...\fR ] [ \fB-sanitize\fR ] [ \fB-numeric\fR ] [ \fB-notime\fR ] [ \fB-quiet\fR ] + .SH "DESCRIPTION" + .PP + +@@ -74,6 +74,8 @@ Remove potentially sensitive information from output (IP addresses, serial numbe + .TP + \fB-numeric\fR + Also display numeric IDs (for PCI and USB devices). ++\fB-notime\fR ++exclude volatile attributes (timestamps) from output + .SH "BUGS" + .PP + \fBlshw\fR currently does not detect +-- +2.18.1 diff --git a/lshw.changes b/lshw.changes index 95d06e3..23f9e2f 100644 --- a/lshw.changes +++ b/lshw.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 5 08:37:14 UTC 2020 - Martin Pluskal + +- Fix bsc#1162690: + * lshw-add-notime-option-to-manpage.patch + ------------------------------------------------------------------- Thu Oct 24 14:25:29 UTC 2019 - Martin Pluskal diff --git a/lshw.spec b/lshw.spec index d821c97..182b99d 100644 --- a/lshw.spec +++ b/lshw.spec @@ -1,7 +1,7 @@ # # spec file for package lshw # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2013 Pascal Bleser # # All modifications and additions to the file contributed by third parties @@ -31,6 +31,7 @@ Source2: lshw.png Patch1: lshw-display-latest-version.patch Patch2: lshw-help-man.patch Patch3: lshw-modified-time.patch +Patch4: lshw-add-notime-option-to-manpage.patch BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libpng-devel @@ -79,13 +80,10 @@ included documentation or go to the lshw Web page, http://www.ezix.org/software/lshw.html %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 %build -make \ +%make_build \ SBINDIR="%{_sbindir}" \ RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" \ STRIP=touch \ @@ -119,10 +117,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/pnpid.txt %doc README.md docs/TODO docs/Changelog docs/lshw.xsd %attr(0755,root,root) %{_sbindir}/lshw %dir %{_datadir}/lshw -%{_mandir}/man1/lshw.1%{ext_man} +%{_mandir}/man1/lshw.1%{?ext_man} %files lang -f %{name}.lang -%defattr(-,root,root) %files gui %defattr(-,root,root,0755)