commit lshw for openSUSE:Factory

2020-09-01 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2020-09-01 20:08:09

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new.3399 (New)


Package is "lshw"

Tue Sep  1 20:08:09 2020 rev:18 rq:830704 version:B.02.19.2

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2020-04-25 
20:36:51.843078638 +0200
+++ /work/SRC/openSUSE:Factory/.lshw.new.3399/lshw.changes  2020-09-01 
20:09:07.556641734 +0200
@@ -1,0 +2,6 @@
+Mon Aug 31 08:34:41 UTC 2020 - Martin Pluskal 
+
+- Fix detection of ppc products - boo#1172156
+  * lshw-fix-ppc.patch
+
+---

New:

  lshw-fix-ppc.patch



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.rmmsUO/_old  2020-09-01 20:09:08.156642015 +0200
+++ /var/tmp/diff_new_pack.rmmsUO/_new  2020-09-01 20:09:08.156642015 +0200
@@ -31,6 +31,8 @@
 Patch1: lshw-fix-segfault-in-apfs-volume-code.patch
 # PATCH-FIX-UPSTREAM - https://github.com/lyonel/lshw/pull/52 - boo#1169668
 Patch2: lshw-fix-mmc.patch
+# PATCH-FIX-UPSTREAM - 
https://github.com/lyonel/lshw/commit/3775782808e8b9b8aa72ed2ce23e145433e193cf 
- boo#1172156
+Patch3: lshw-fix-ppc.patch
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libpng-devel

++ lshw-fix-ppc.patch ++
>From 3775782808e8b9b8aa72ed2ce23e145433e193cf Mon Sep 17 00:00:00 2001
From: Lyonel Vincent 
Date: Wed, 27 May 2020 01:16:20 +0200
Subject: [PATCH] report product model on Power systems

Github PR #54
---
 src/core/device-tree.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc
index e7227e1..027ad16 100644
--- a/src/core/device-tree.cc
+++ b/src/core/device-tree.cc
@@ -1396,7 +1396,7 @@ static void get_ibm_model(hwNode & n)
   {
 if (ibm_model_defs[i].model == machinetype || ibm_model_defs[i].model == 
model)
 {
-  n.setProduct(ibm_model_defs[i].modelname);
+  n.setProduct(n.getProduct() + " (" + ibm_model_defs[i].modelname + ")");
   n.addHint("icon", string(ibm_model_defs[i].icon));
   n.setConfig("chassis", ibm_model_defs[i].chassis);
   return;

commit lshw for openSUSE:Factory

2020-04-25 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2020-04-25 20:35:01

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new.2738 (New)


Package is "lshw"

Sat Apr 25 20:35:01 2020 rev:17 rq:797213 version:B.02.19.2

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2020-04-23 
18:40:39.729261366 +0200
+++ /work/SRC/openSUSE:Factory/.lshw.new.2738/lshw.changes  2020-04-25 
20:36:51.843078638 +0200
@@ -1,0 +2,9 @@
+Fri Apr 24 13:15:19 UTC 2020 - Guillaume GARDET 
+
+- Reenable LTO for powerpc and aarch64
+- Fix PowerPC and aarch64 LTO: boo#1168865 and boo#1169668
+  * lshw-fix-segfault-in-apfs-volume-code.patch
+- Fix aarch64 SIGABRT: (boo#1169668)
+  * lshw-fix-mmc.patch
+
+---

New:

  lshw-fix-mmc.patch
  lshw-fix-segfault-in-apfs-volume-code.patch



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.0JM9xq/_old  2020-04-25 20:36:52.679080362 +0200
+++ /var/tmp/diff_new_pack.0JM9xq/_new  2020-04-25 20:36:52.683080369 +0200
@@ -27,6 +27,10 @@
 Source: https://www.ezix.org/software/files/lshw-%{version}.tar.gz
 Source1:lshw.desktop.in
 Source2:lshw.png
+# PATCH-FIX-UPSTREAM - https://ezix.org/src/pkg/lshw/pulls/32 - boo#1168865 
and boo#1169668
+Patch1: lshw-fix-segfault-in-apfs-volume-code.patch
+# PATCH-FIX-UPSTREAM - https://github.com/lyonel/lshw/pull/52 - boo#1169668
+Patch2: lshw-fix-mmc.patch
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libpng-devel
@@ -74,14 +78,9 @@
 http://www.ezix.org/software/lshw.html
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
-%ifarch ppc64 ppc64le aarch64
-# Disable LTO for specified arches, bypass bug
-# https://bugzilla.opensuse.org/show_bug.cgi?id=1168865
-%define _lto_cflags %{nil}
-%endif
 
 %make_build \
   SBINDIR="%{_sbindir}" \

++ lshw-fix-mmc.patch ++
>From 2524bb3def3009e53a78e600bbea2c4639dc1e99 Mon Sep 17 00:00:00 2001
From: Martin Liska 
Date: Fri, 24 Apr 2020 15:02:44 +0200
Subject: [PATCH] Fix type used for read to ssize_t.

Function declaration:
ssize_t read(int fd, void *buf, size_t count);

With size_t the following expression is always true:
while ((count = read(cpuinfo, buffer, sizeof(buffer))) > 0)

and bad things happen.
---
 src/core/cpuinfo.cc | 2 +-
 src/core/osutils.cc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/cpuinfo.cc b/src/core/cpuinfo.cc
index eceb83a..3dbdd0c 100644
--- a/src/core/cpuinfo.cc
+++ b/src/core/cpuinfo.cc
@@ -589,7 +589,7 @@ bool scan_cpuinfo(hwNode & n)
   if (core)
   {
 char buffer[1024];
-size_t count;
+ssize_t count;
 string cpuinfo_str = "";
 string description = "", version = "";
 string plat = platform();
diff --git a/src/core/osutils.cc b/src/core/osutils.cc
index f023a46..a53ed89 100644
--- a/src/core/osutils.cc
+++ b/src/core/osutils.cc
@@ -148,7 +148,7 @@ vector < string > )
 {
   char buffer[1024];
   string buffer_str = "";
-  size_t count = 0;
+  ssize_t count = 0;
   data_file fd = file_open(file);
 
   if (file_open_error(fd))
@@ -174,7 +174,7 @@ const string & def)
   if (fd >= 0)
   {
 char buffer[1024];
-size_t count = 0;
+ssize_t count = 0;
 
 memset(buffer, 0, sizeof(buffer));
 result = "";
++ lshw-fix-segfault-in-apfs-volume-code.patch ++
>From 82df4fa7d3705f2f61282ed5b22074d4e0a6efc4 Mon Sep 17 00:00:00 2001
From: Harry Mallon 
Date: Thu, 23 Apr 2020 21:18:47 +0100
Subject: [PATCH] volumes: fix segfault in apfs volume code

---
 src/core/volumes.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/volumes.cc b/src/core/volumes.cc
index e703523..6fce2ee 100644
--- a/src/core/volumes.cc
+++ b/src/core/volumes.cc
@@ -784,12 +784,13 @@ struct apfs_super_block {
 
 static bool detect_apfs(hwNode & n, source & s)
 {
-  static char buffer[sizeof(apfs_super_block)];
+  static char buffer[APFS_STANDARD_BLOCK_SIZE];
   source apfsvolume;
   apfs_super_block *sb = (apfs_super_block*)buffer;
   unsigned long block_size;
 
   apfsvolume = s;
+  apfsvolume.blocksize = APFS_STANDARD_BLOCK_SIZE;
 
   if(readlogicalblocks(apfsvolume, buffer, 0, 1)!=1)
 return false;

commit lshw for openSUSE:Factory

2020-04-23 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2020-04-23 18:40:34

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new.2738 (New)


Package is "lshw"

Thu Apr 23 18:40:34 2020 rev:16 rq:796573 version:B.02.19.2

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2020-03-30 
23:03:44.084187842 +0200
+++ /work/SRC/openSUSE:Factory/.lshw.new.2738/lshw.changes  2020-04-23 
18:40:39.729261366 +0200
@@ -1,0 +2,5 @@
+Thu Apr 23 12:16:28 UTC 2020 - Michel Normand 
+
+- Disable LTO for aarch64 & PowerPC, bypass boo#1168865
+
+---



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.mZSjmk/_old  2020-04-23 18:40:40.677263179 +0200
+++ /var/tmp/diff_new_pack.mZSjmk/_new  2020-04-23 18:40:40.681263187 +0200
@@ -77,6 +77,12 @@
 %autosetup
 
 %build
+%ifarch ppc64 ppc64le aarch64
+# Disable LTO for specified arches, bypass bug
+# https://bugzilla.opensuse.org/show_bug.cgi?id=1168865
+%define _lto_cflags %{nil}
+%endif
+
 %make_build \
   SBINDIR="%{_sbindir}" \
   RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" \

commit lshw for openSUSE:Factory

2020-03-30 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2020-03-30 23:03:43

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new.3160 (New)


Package is "lshw"

Mon Mar 30 23:03:43 2020 rev:15 rq:789653 version:B.02.19.2

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2020-03-17 
13:09:39.565776580 +0100
+++ /work/SRC/openSUSE:Factory/.lshw.new.3160/lshw.changes  2020-03-30 
23:03:44.084187842 +0200
@@ -1,0 +2,11 @@
+Mon Mar 30 06:49:19 UTC 2020 - Martin Pluskal 
+
+- Update to version B.02.19.2:
+  * New release tagged, no significant changes from previous
+version (git snapsho)
+- Drop no longer needed patches:
+  * lshw-display-latest-version.patch
+  * lshw-add-notime-option-to-manpage.patch
+  * lshw-nvme.patch
+
+---

Old:

  _service
  _servicedata
  lshw-B.02.18+git.20191228.tar.xz
  lshw-add-notime-option-to-manpage.patch
  lshw-display-latest-version.patch
  lshw-nvme.patch

New:

  lshw-B.02.19.2.tar.gz



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.3do09r/_old  2020-03-30 23:03:44.904188309 +0200
+++ /var/tmp/diff_new_pack.3do09r/_new  2020-03-30 23:03:44.908188312 +0200
@@ -18,19 +18,15 @@
 
 
 Name:   lshw
-Version:B.02.18+git.20191228
+Version:B.02.19.2
 Release:0
 Summary:HardWare LiSter
 License:GPL-2.0-only
 Group:  Hardware/Other
 URL:https://www.ezix.org/project/wiki/HardwareLiSter
-Source: lshw-%{version}.tar.xz
+Source: https://www.ezix.org/software/files/lshw-%{version}.tar.gz
 Source1:lshw.desktop.in
 Source2:lshw.png
-# PATCH-FIX-UPSTREAM lshw-display-latest-version.patch lshw-help-man.patch 
lshw-modified-time.patch bsc##1130818
-Patch1: lshw-display-latest-version.patch
-Patch4: lshw-add-notime-option-to-manpage.patch
-Patch5: lshw-nvme.patch
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libpng-devel
@@ -78,10 +74,9 @@
 http://www.ezix.org/software/lshw.html
 
 %prep
-%autosetup -p1
+%autosetup
 
 %build
-%define _lto_cflags %{nil}
 %make_build \
   SBINDIR="%{_sbindir}" \
   RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" \

commit lshw for openSUSE:Factory

2020-03-17 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2020-03-17 13:09:34

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new.3160 (New)


Package is "lshw"

Tue Mar 17 13:09:34 2020 rev:14 rq:785615 version:B.02.18+git.20191228

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2020-02-20 
14:59:48.198808774 +0100
+++ /work/SRC/openSUSE:Factory/.lshw.new.3160/lshw.changes  2020-03-17 
13:09:39.565776580 +0100
@@ -1,0 +2,16 @@
+Mon Mar 16 12:14:54 UTC 2020 - Martin Pluskal 
+
+- Update to version B.02.18+git.20191228:
+  * fix #755: handle invalid FAT
+  * code clean-up
+  * volumes: Add support for detecting Apple APFS fstype
+  * partitions: Add Apple APFS GUID
+  * specfile: Fix version issue
+  * Do not show modified time with -notime option
+  * Update help message and man page
+- Drop upstreamed patches:
+  * lshw-help-man.patch
+  * lshw-modified-time.patch
+- Add lshw-nvme.patch to support nvme devices bsc#1161323
+
+---

Old:

  lshw-B.02.18+git.20190613.tar.xz
  lshw-help-man.patch
  lshw-modified-time.patch

New:

  lshw-B.02.18+git.20191228.tar.xz
  lshw-nvme.patch



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.4w71bm/_old  2020-03-17 13:09:40.061776961 +0100
+++ /var/tmp/diff_new_pack.4w71bm/_new  2020-03-17 13:09:40.061776961 +0100
@@ -18,7 +18,7 @@
 
 
 Name:   lshw
-Version:B.02.18+git.20190613
+Version:B.02.18+git.20191228
 Release:0
 Summary:HardWare LiSter
 License:GPL-2.0-only
@@ -29,9 +29,8 @@
 Source2:lshw.png
 # PATCH-FIX-UPSTREAM lshw-display-latest-version.patch lshw-help-man.patch 
lshw-modified-time.patch bsc##1130818
 Patch1: lshw-display-latest-version.patch
-Patch2: lshw-help-man.patch
-Patch3: lshw-modified-time.patch
 Patch4: lshw-add-notime-option-to-manpage.patch
+Patch5: lshw-nvme.patch
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libpng-devel

++ _servicedata ++
--- /var/tmp/diff_new_pack.4w71bm/_old  2020-03-17 13:09:40.089776982 +0100
+++ /var/tmp/diff_new_pack.4w71bm/_new  2020-03-17 13:09:40.089776982 +0100
@@ -1,4 +1,4 @@
 
 
 https://github.com/lyonel/lshw.git
-  9567d10e4eb1c561030444dd3b7fe50ebb755f3e
\ No newline at end of file
+  89b3b6b9ed03f22ca98954712db5a90acf2c6755
\ No newline at end of file

++ lshw-B.02.18+git.20190613.tar.xz -> lshw-B.02.18+git.20191228.tar.xz 
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lshw-B.02.18+git.20190613/lshw.spec.in 
new/lshw-B.02.18+git.20191228/lshw.spec.in
--- old/lshw-B.02.18+git.20190613/lshw.spec.in  2019-06-13 22:23:04.0 
+0200
+++ new/lshw-B.02.18+git.20191228/lshw.spec.in  2019-12-28 00:02:44.0 
+0100
@@ -57,6 +57,7 @@
   SBINDIR="%{_sbindir}" \
   MANDIR="%{_mandir}" \
   DATADIR="%{_datadir}" \
+  VERSION="%{version}" \
   all
 %if %{!?_without_gui:1}0
 %{__make} %{?_smp_mflags} \
@@ -64,6 +65,7 @@
   SBINDIR="%{_sbindir}" \
   MANDIR="%{_mandir}" \
   DATADIR="%{_datadir}" \
+  VERSION="%{version}" \
   gui
 %endif
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lshw-B.02.18+git.20190613/src/core/fat.cc 
new/lshw-B.02.18+git.20191228/src/core/fat.cc
--- old/lshw-B.02.18+git.20190613/src/core/fat.cc   2019-06-13 
22:23:04.0 +0200
+++ new/lshw-B.02.18+git.20191228/src/core/fat.cc   2019-12-28 
00:02:44.0 +0100
@@ -186,11 +186,6 @@
if (vs.heads == 0)
return false;
 
-   /* cluster size check */
-   if (vs.sectors_per_cluster == 0 ||
-   (vs.sectors_per_cluster & (vs.sectors_per_cluster-1)))
-   return false;
-
/* media check */
if (vs.media < 0xf8 && vs.media != 0xf0)
return false;
@@ -200,6 +195,11 @@
return false;
 
 valid:
+   /* cluster size check */
+   if (vs.sectors_per_cluster == 0 ||
+   (vs.sectors_per_cluster & (vs.sectors_per_cluster-1)))
+   return false;
+
/* sector size check */
sector_size_bytes = le_short(_size_bytes);
if (sector_size_bytes != 0x200 && sector_size_bytes != 0x400 &&
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lshw-B.02.18+git.20190613/src/core/partitions.cc 
new/lshw-B.02.18+git.20191228/src/core/partitions.cc
--- old/lshw-B.02.18+git.20190613/src/core/partitions.cc2019-06-13 
22:23:04.0 +0200
+++

commit lshw for openSUSE:Factory

2020-02-20 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2020-02-20 14:59:42

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new.26092 (New)


Package is "lshw"

Thu Feb 20 14:59:42 2020 rev:13 rq:777588 version:B.02.18+git.20190613

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2020-02-10 
21:53:16.906186293 +0100
+++ /work/SRC/openSUSE:Factory/.lshw.new.26092/lshw.changes 2020-02-20 
14:59:48.198808774 +0100
@@ -1,0 +2,6 @@
+Thu Feb 20 08:15:44 UTC 2020 - Martin Pluskal 
+
+- Disable LTO as it causes random build failures on some
+  architectures (bsc#1164297)
+
+---



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.j3gjYe/_old  2020-02-20 14:59:49.702811725 +0100
+++ /var/tmp/diff_new_pack.j3gjYe/_new  2020-02-20 14:59:49.702811725 +0100
@@ -82,6 +82,7 @@
 %autosetup -p1
 
 %build
+%define _lto_cflags %{nil}
 %make_build \
   SBINDIR="%{_sbindir}" \
   RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" \

commit lshw for openSUSE:Factory

2020-02-10 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2020-02-10 21:53:05

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new.26092 (New)


Package is "lshw"

Mon Feb 10 21:53:05 2020 rev:12 rq:772322 version:B.02.18+git.20190613

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2020-02-05 
19:42:42.519296459 +0100
+++ /work/SRC/openSUSE:Factory/.lshw.new.26092/lshw.changes 2020-02-10 
21:53:16.906186293 +0100
@@ -1,0 +2,5 @@
+Fri Feb  7 10:50:13 UTC 2020 - Bjørn Lie 
+
+- No longer recommend -lang: supplements are in use.
+
+---



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.la7UXI/_old  2020-02-10 21:53:17.850186815 +0100
+++ /var/tmp/diff_new_pack.la7UXI/_new  2020-02-10 21:53:17.870186826 +0100
@@ -38,7 +38,6 @@
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.4
-Recommends: %{name}-lang
 Recommends: hwdata
 %lang_package

commit lshw for openSUSE:Factory

2020-02-05 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2020-02-05 19:42:26

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new.26092 (New)


Package is "lshw"

Wed Feb  5 19:42:26 2020 rev:11 rq:770160 version:B.02.18+git.20190613

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2019-10-24 
23:11:11.848664671 +0200
+++ /work/SRC/openSUSE:Factory/.lshw.new.26092/lshw.changes 2020-02-05 
19:42:42.519296459 +0100
@@ -1,0 +2,6 @@
+Wed Feb  5 08:37:14 UTC 2020 - Martin Pluskal 
+
+- Fix bsc#1162690:
+  * lshw-add-notime-option-to-manpage.patch
+
+---

New:

  lshw-add-notime-option-to-manpage.patch



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.dtbBWU/_old  2020-02-05 19:42:45.071297674 +0100
+++ /var/tmp/diff_new_pack.dtbBWU/_new  2020-02-05 19:42:45.091297684 +0100
@@ -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 @@
 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 @@
 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 @@
 %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)

++ lshw-add-notime-option-to-manpage.patch ++
>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

commit lshw for openSUSE:Factory

2019-10-24 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2019-10-24 23:11:00

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new.2990 (New)


Package is "lshw"

Thu Oct 24 23:11:00 2019 rev:10 rq:742629 version:B.02.18+git.20190613

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2019-05-02 
19:21:56.637860347 +0200
+++ /work/SRC/openSUSE:Factory/.lshw.new.2990/lshw.changes  2019-10-24 
23:11:11.848664671 +0200
@@ -1,0 +2,9 @@
+Thu Oct 24 14:25:29 UTC 2019 - Martin Pluskal 
+
+- Update to version B.02.18+git.20190613 (fate#326432 jsc#SLE-7715):
+  * devtree: Add DIMM running speed
+  * spd: Print dimm rank information
+  * Display proper logical name of network device
+- Drop no longer needed lswh-logical-name-iface.patch
+
+---

Old:

  lshw-B.02.18+git.20190324.tar.xz
  lswh-logical-name-iface.patch

New:

  lshw-B.02.18+git.20190613.tar.xz



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.kKkCBC/_old  2019-10-24 23:11:12.328665231 +0200
+++ /var/tmp/diff_new_pack.kKkCBC/_new  2019-10-24 23:11:12.332665236 +0200
@@ -18,7 +18,7 @@
 
 
 Name:   lshw
-Version:B.02.18+git.20190324
+Version:B.02.18+git.20190613
 Release:0
 Summary:HardWare LiSter
 License:GPL-2.0-only
@@ -27,8 +27,6 @@
 Source: lshw-%{version}.tar.xz
 Source1:lshw.desktop.in
 Source2:lshw.png
-# PATCH-FIX-UPSTREAM lswh-logical-name-iface.patch bsc#1133923
-Patch0: lswh-logical-name-iface.patch
 # PATCH-FIX-UPSTREAM lshw-display-latest-version.patch lshw-help-man.patch 
lshw-modified-time.patch bsc##1130818
 Patch1: lshw-display-latest-version.patch
 Patch2: lshw-help-man.patch
@@ -82,7 +80,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -96,7 +93,7 @@
   all gui
 
 %install
-%make_install install-gui
+%make_install install-gui VERSION="%{version}"
 
 install -d "%{buildroot}%{_datadir}/applications"
 sed 's,@@EXEC@@,%{_sbindir}/gtk-lshw,g' < "%{SOURCE1}" \

++ _servicedata ++
--- /var/tmp/diff_new_pack.kKkCBC/_old  2019-10-24 23:11:12.368665278 +0200
+++ /var/tmp/diff_new_pack.kKkCBC/_new  2019-10-24 23:11:12.368665278 +0200
@@ -1,4 +1,4 @@
 
 
 https://github.com/lyonel/lshw.git
-  6cc0581bc805c8bf7ea057c065c3c36caf744ef3
\ No newline at end of file
+  9567d10e4eb1c561030444dd3b7fe50ebb755f3e
\ No newline at end of file

++ lshw-B.02.18+git.20190324.tar.xz -> lshw-B.02.18+git.20190613.tar.xz 
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lshw-B.02.18+git.20190324/src/core/device-tree.cc 
new/lshw-B.02.18+git.20190613/src/core/device-tree.cc
--- old/lshw-B.02.18+git.20190324/src/core/device-tree.cc   2019-03-24 
11:18:57.0 +0100
+++ new/lshw-B.02.18+git.20190613/src/core/device-tree.cc   2019-06-13 
22:23:04.0 +0200
@@ -863,6 +863,7 @@
   close(fd);
 
   if (dimminfo[2] >= 9) {
+int rank_offset;
 double ns;
 char vendor[5];
 const char *type, *mod_type;
@@ -879,6 +880,7 @@
   partno_offset = 0x149;
   bus_width_offset = 0x0d;
   serial_offset = 0x145;
+  rank_offset = 0xc;
 
   /*
* There is no other valid values for the medium- and fine- timebase
@@ -897,6 +899,7 @@
   partno_offset = 0x80;
   serial_offset = 0x7a;
   bus_width_offset = 0x08;
+  rank_offset = 0x7;
 
   ns = (dimminfo[0xc] / 2) * (dimminfo[0xa] / (float) dimminfo[0xb]);
   snprintf(vendor, sizeof(vendor), "%x%x", dimminfo[0x76], dimminfo[0x75]);
@@ -914,6 +917,9 @@
 break;
 }
 
+// Add DIMM rank
+bank.setConfig("rank", ((dimminfo[rank_offset] >> 3) & 0x7) + 1);
+
 bank.setClock(10 / ns);
 bank.setVendor(jedec_resolve(vendor));
 
@@ -1038,6 +1044,10 @@
 if (exists("spd"))
   add_memory_bank_spd(path + "/" + name + "/spd", bank);
 
+// Parse Memory SPD data
+if (exists("frequency"))
+  bank.setClock(get_u32("frequency"));
+
 memory->addChild(bank);
   } else if(name.substr(0, 4) == "dimm") {
 hwNode bank("bank", hw::memory);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lshw-B.02.18+git.20190324/src/core/hw.cc 
new/lshw-B.02.18+git.20190613/src/core/hw.cc
--- old/lshw-B.02.18+git.20190324/src/core/hw.cc2019-03-24 
11:18:57.0 +0100
+++ new/lshw-B.02.18+git.20190613/src/core/hw.cc2019-06-13 
22:23:04.0 +0200
@@ -1284,8 +1284,8 @@
 This->handle = node.getHandle();
   if

commit lshw for openSUSE:Factory

2019-05-02 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2019-05-02 19:21:47

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new.5148 (New)


Package is "lshw"

Thu May  2 19:21:47 2019 rev:9 rq:700059 version:B.02.18+git.20190324

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2019-03-28 
22:49:35.671044874 +0100
+++ /work/SRC/openSUSE:Factory/.lshw.new.5148/lshw.changes  2019-05-02 
19:21:56.637860347 +0200
@@ -1,0 +2,10 @@
+Thu May  2 09:56:21 UTC 2019 - Martin Pluskal 
+
+- Fix displaying proper logical name of network device bsc#1133923
+  * lswh-logical-name-iface.patch
+- Fix displaying correct version bsc##1130818
+  * lshw-display-latest-version.patch
+  * lshw-help-man.patch
+  * lshw-modified-time.patch
+
+---

New:

  lshw-display-latest-version.patch
  lshw-help-man.patch
  lshw-modified-time.patch
  lswh-logical-name-iface.patch



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.sh2Jgq/_old  2019-05-02 19:21:58.333863870 +0200
+++ /var/tmp/diff_new_pack.sh2Jgq/_new  2019-05-02 19:21:58.337863878 +0200
@@ -27,6 +27,12 @@
 Source: lshw-%{version}.tar.xz
 Source1:lshw.desktop.in
 Source2:lshw.png
+# PATCH-FIX-UPSTREAM lswh-logical-name-iface.patch bsc#1133923
+Patch0: lswh-logical-name-iface.patch
+# PATCH-FIX-UPSTREAM lshw-display-latest-version.patch lshw-help-man.patch 
lshw-modified-time.patch bsc##1130818
+Patch1: lshw-display-latest-version.patch
+Patch2: lshw-help-man.patch
+Patch3: lshw-modified-time.patch
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libpng-devel
@@ -76,6 +82,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 make \

++ lshw-display-latest-version.patch ++
>From 5e58d66598908249f44d349d22efdc4524f0cfcb Mon Sep 17 00:00:00 2001
From: Vasant Hegde 
Date: Mon, 29 Apr 2019 22:39:08 +0530
Subject: [PATCH] Fix version output

Display latest version only when its greater than current version.

"lshw -version" tries to get current version from upstream repository.
If it contains old version then output becomes confusing (as running
version > latest version).

Signed-off-by: Vasant Hegde 
---
 src/lshw.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lshw.cc b/src/lshw.cc
index 219a008..be233eb 100644
--- a/src/lshw.cc
+++ b/src/lshw.cc
@@ -121,7 +121,7 @@ char **argv)
   printf("%s\n", getpackageversion());
   if(latest)
   {
-if(strcmp(latest, getpackageversion()) != 0)
+if(strcmp(latest, getpackageversion()) >= 0)
   fprintf(stderr, _("the latest version is %s\n"), latest);
   }
   exit(0);
++ lshw-help-man.patch ++
>From 33951733bb800321780444a178b969c212c65875 Mon Sep 17 00:00:00 2001
From: Seeteena Thoufeek 
Date: Wed, 12 Jul 2017 11:00:43 +0530
Subject: [PATCH] Update help message and man page

lshw -dump option displays output on stdout as well as stores SQLite
format data into a file. Lets update man page and help message to
reflect this.

Signed-off-by: Seeteena Thoufeek 
[Updated description - Vasant]
Signed-off-by: Vasant Hegde 
---
 src/lshw.1  | 2 +-
 src/lshw.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lshw.1 b/src/lshw.1
index 43239da..79c3619 100644
--- a/src/lshw.1
+++ b/src/lshw.1
@@ -53,7 +53,7 @@ Outputs the device tree showing hardware paths, very much 
like the output of HP-
 Outputs the device list showing bus information, detailing SCSI, USB, IDE and 
PCI addresses.
 .TP
 \fB-dump \fIfilename\fB\fR
-Dump collected information into a file (SQLite database).
+Display output and dump collected information into a file (SQLite database).
 .TP
 \fB-class \fIclass\fB\fR
 Only show the given class of hardware. \fIclass\fR can be found using \fBlshw 
-short\fR or \fBlshw -businfo\fR\&.
diff --git a/src/lshw.cc b/src/lshw.cc
index 5fc8ade..219a008 100644
--- a/src/lshw.cc
+++ b/src/lshw.cc
@@ -35,7 +35,7 @@ void usage(const char *progname)
 fprintf(stderr, _("\t-X  use graphical interface\n"));
   fprintf(stderr, _("\noptions can be\n"));
 #ifdef SQLITE
-  fprintf(stderr, _("\t-dump OUTFILE   save hardware tree to a file\n"));
+  fprintf(stderr, _("\t-dump filename  displays output and dump collected 
information into a file (SQLite database)\n"));
 #endif
   fprintf(stderr, _("\t-class CLASSonly show a certain class of 
hardware\n"));
   fprintf(stderr, _("\t-C CLASSsame as '-class CLASS'\n"));
++ lshw-modified-time.patch ++
>From

commit lshw for openSUSE:Factory

2019-03-28 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2019-03-28 22:49:34

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new.25356 (New)


Package is "lshw"

Thu Mar 28 22:49:34 2019 rev:8 rq:689318 version:B.02.18+git.20190324

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2019-01-08 
12:31:27.984076844 +0100
+++ /work/SRC/openSUSE:Factory/.lshw.new.25356/lshw.changes 2019-03-28 
22:49:35.671044874 +0100
@@ -1,0 +2,7 @@
+Thu Mar 28 09:34:43 UTC 2019 - Martin Pluskal 
+
+- Update to version B.02.18+git.20190324:
+  * merge Github PR44
+- Set correct version (bsc#1130818)
+
+---

Old:

  lshw-B.02.18+git.20190104.tar.xz

New:

  lshw-B.02.18+git.20190324.tar.xz



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.yKGs69/_old  2019-03-28 22:49:36.179044782 +0100
+++ /var/tmp/diff_new_pack.yKGs69/_new  2019-03-28 22:49:36.183044780 +0100
@@ -18,7 +18,7 @@
 
 
 Name:   lshw
-Version:B.02.18+git.20190104
+Version:B.02.18+git.20190324
 Release:0
 Summary:HardWare LiSter
 License:GPL-2.0-only
@@ -82,6 +82,7 @@
   SBINDIR="%{_sbindir}" \
   RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" \
   STRIP=touch \
+  VERSION="%{version}" \
   all gui
 
 %install

++ _servicedata ++
--- /var/tmp/diff_new_pack.yKGs69/_old  2019-03-28 22:49:36.211044776 +0100
+++ /var/tmp/diff_new_pack.yKGs69/_new  2019-03-28 22:49:36.211044776 +0100
@@ -1,4 +1,4 @@
 
 
 https://github.com/lyonel/lshw.git
-  40e8f907cc36ab8b904d8606f3109cfc27c1569b
\ No newline at end of file
+  6cc0581bc805c8bf7ea057c065c3c36caf744ef3
\ No newline at end of file

++ lshw-B.02.18+git.20190104.tar.xz -> lshw-B.02.18+git.20190324.tar.xz 
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/lshw-B.02.18+git.20190104/src/core/pci.cc 
new/lshw-B.02.18+git.20190324/src/core/pci.cc
--- old/lshw-B.02.18+git.20190104/src/core/pci.cc   2019-01-04 
11:21:50.0 +0100
+++ new/lshw-B.02.18+git.20190324/src/core/pci.cc   2019-03-24 
11:18:57.0 +0100
@@ -105,6 +105,7 @@
 #define PCI_CLASS_STORAGE_RAID   0x0104
 #define PCI_CLASS_STORAGE_SATA   0x0106
 #define PCI_CLASS_STORAGE_SAS0x0107
+#define PCI_CLASS_STORAGE_NVME   0x0108
 #define PCI_CLASS_STORAGE_OTHER  0x0180
 
 #define PCI_BASE_CLASS_NETWORK   0x02
@@ -340,6 +341,8 @@
   return "sata";
 case PCI_CLASS_STORAGE_SAS:
   return "sas";
+case PCI_CLASS_STORAGE_NVME:
+  return "nvme";
 case PCI_CLASS_BRIDGE_HOST:
   return "host";
 case PCI_CLASS_BRIDGE_ISA:

commit lshw for openSUSE:Factory

2019-01-08 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2019-01-08 12:29:19

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new.28833 (New)


Package is "lshw"

Tue Jan  8 12:29:19 2019 rev:7 rq:663348 version:B.02.18+git.20190104

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2018-02-07 
18:43:41.717772080 +0100
+++ /work/SRC/openSUSE:Factory/.lshw.new.28833/lshw.changes 2019-01-08 
12:31:27.984076844 +0100
@@ -1,0 +2,14 @@
+Mon Jan  7 12:36:40 UTC 2019 - Martin Pluskal 
+
+- Update to version B.02.18+git.20190104:
+  * Resolves bsc#1120819 bsc#1093650 fate#326432
+  * various new HW enablement, including:
++ improved support for latest PPC64LE
++ DDR4
+- Drop no longer needed patches:
+  * lshw-cpuinfo.patch
+  * lshw-devtree_cpunodes.patch 
+  * lshw-devtree_machine_describtion.patch
+  * lshw-dimminfo.patch
+
+---

Old:

  lshw-B.02.18.tar.gz
  lshw-cpuinfo.patch
  lshw-devtree_cpunodes.patch
  lshw-devtree_machine_describtion.patch
  lshw-dimminfo.patch

New:

  _service
  _servicedata
  lshw-B.02.18+git.20190104.tar.xz



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.ZsjbL3/_old  2019-01-08 12:31:28.444076344 +0100
+++ /var/tmp/diff_new_pack.ZsjbL3/_new  2019-01-08 12:31:28.444076344 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package lshw
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2013 Pascal Bleser 
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,28 +13,20 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:   lshw
-Version:B.02.18
+Version:B.02.18+git.20190104
 Release:0
 Summary:HardWare LiSter
-License:GPL-2.0
+License:GPL-2.0-only
 Group:  Hardware/Other
 URL:https://www.ezix.org/project/wiki/HardwareLiSter
-Source: https://www.ezix.org/software/files/lshw-%{version}.tar.gz
+Source: lshw-%{version}.tar.xz
 Source1:lshw.desktop.in
 Source2:lshw.png
-# PATCH-FIX-UPSTREAM -- lshw-dimminfo.patch bsc#1079846
-Patch0: lshw-dimminfo.patch
-# PATCH-FIX-UPSTREAM -- lshw-devtree_cpunodes.patch bsc#1079846
-Patch1: lshw-devtree_cpunodes.patch
-# PATCH-FIX-UPSTREAM -- lshw-devtree_machine_describtion.patch bsc#1079846
-Patch2: lshw-devtree_machine_describtion.patch
-# PATCH-FIX-UPSTREAM -- lshw-cpuinfo.patch bsc#1079846
-Patch3: lshw-cpuinfo.patch
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libpng-devel
@@ -84,10 +76,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 make \
@@ -110,14 +98,17 @@
 # All of following are shipped by other packages as well
 rm -f %{buildroot}%{_datadir}/%{name}/pci.ids
 rm -f %{buildroot}%{_datadir}/%{name}/usb.ids
+rm -f %{buildroot}%{_datadir}/%{name}/pnp.ids
 rm -f %{buildroot}%{_datadir}/%{name}/oui.txt
 rm -f %{buildroot}%{_datadir}/%{name}/manuf.txt
+rm -f %{buildroot}%{_datadir}/%{name}/pnpid.txt
 
 %find_lang lshw
 
 %files
 %defattr(-,root,root,0755)
-%doc README.md COPYING docs/TODO docs/Changelog docs/lshw.xsd
+%license COPYING
+%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}
@@ -127,7 +118,7 @@
 
 %files gui
 %defattr(-,root,root,0755)
-%doc COPYING
+%license COPYING
 %attr(0755,root,root) %{_sbindir}/gtk-lshw
 %{_datadir}/lshw/artwork
 %{_datadir}/lshw/ui

++ _service ++

  
https://github.com/lyonel/lshw.git
git
enable
lshw
B.02.18+git.%cd
  
  
*.tar
xz
  
  

++ _servicedata ++


https://github.com/lyonel/lshw.git
  40e8f907cc36ab8b904d8606f3109cfc27c1569b

commit lshw for openSUSE:Factory

2018-02-07 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2018-02-07 18:43:37

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new (New)


Package is "lshw"

Wed Feb  7 18:43:37 2018 rev:6 rq:573782 version:B.02.18

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2017-06-07 
09:56:36.104692204 +0200
+++ /work/SRC/openSUSE:Factory/.lshw.new/lshw.changes   2018-02-07 
18:43:41.717772080 +0100
@@ -1,0 +2,10 @@
+Wed Feb  7 15:58:41 UTC 2018 - mplus...@suse.com
+
+- Drop not needed post macros
+- Add ppc enablement patches (bsc#1079846):
+  * lshw-cpuinfo.patch
+  * lshw-devtree_cpunodes.patch 
+  * lshw-devtree_machine_describtion.patch
+  * lshw-dimminfo.patch
+
+---

New:

  lshw-cpuinfo.patch
  lshw-devtree_cpunodes.patch
  lshw-devtree_machine_describtion.patch
  lshw-dimminfo.patch



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.D6CaUi/_old  2018-02-07 18:43:42.469736872 +0100
+++ /var/tmp/diff_new_pack.D6CaUi/_new  2018-02-07 18:43:42.473736684 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package lshw
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2013 Pascal Bleser 
 #
 # All modifications and additions to the file contributed by third parties
@@ -23,18 +23,26 @@
 Summary:HardWare LiSter
 License:GPL-2.0
 Group:  Hardware/Other
-Url:https://www.ezix.org/project/wiki/HardwareLiSter
+URL:https://www.ezix.org/project/wiki/HardwareLiSter
 Source: https://www.ezix.org/software/files/lshw-%{version}.tar.gz
 Source1:lshw.desktop.in
 Source2:lshw.png
+# PATCH-FIX-UPSTREAM -- lshw-dimminfo.patch bsc#1079846
+Patch0: lshw-dimminfo.patch
+# PATCH-FIX-UPSTREAM -- lshw-devtree_cpunodes.patch bsc#1079846
+Patch1: lshw-devtree_cpunodes.patch
+# PATCH-FIX-UPSTREAM -- lshw-devtree_machine_describtion.patch bsc#1079846
+Patch2: lshw-devtree_machine_describtion.patch
+# PATCH-FIX-UPSTREAM -- lshw-cpuinfo.patch bsc#1079846
+Patch3: lshw-cpuinfo.patch
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libpng-devel
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.4
-Recommends: hwdata
 Recommends: %{name}-lang
+Recommends: hwdata
 %lang_package
 
 %description
@@ -76,6 +84,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 make \
@@ -103,14 +115,6 @@
 
 %find_lang lshw
 
-%post gui
-%desktop_database_post
-%icon_theme_cache_post
-
-%postun gui
-%desktop_database_postun
-%icon_theme_cache_postun
-
 %files
 %defattr(-,root,root,0755)
 %doc README.md COPYING docs/TODO docs/Changelog docs/lshw.xsd

++ lshw-cpuinfo.patch ++
>From 9a81309286a05f2b088c9898a0e3a16e807532be Mon Sep 17 00:00:00 2001
From: Chandni Verma 
Date: Thu, 20 Oct 2016 19:24:46 +0530
Subject: [PATCH] cpuinfo: Rectify cpuinfo for IBM Power Systems

'/proc/cpuinfo' file on Power Systems represents online CPU threads,
not physical cores. Also we can dynamically change number of threads.

Previous patch added support to parse device tree and display core
information under CPU nodes.

This patch pulls useful info from cpuinfo file and updates CPU nodes.
  - description : Processor description
  - version : Processor version including subversion

Signed-off-by: Chandni Verma 
[Code cleanup, updated description - Vasant]
Signed-off-by: Vasant Hegde 
---
 src/core/cpuinfo.cc | 47 ++-
 1 file changed, 46 insertions(+), 1 deletion(-)

Index: lshw-B.02.18/src/core/cpuinfo.cc
===
--- lshw-B.02.18.orig/src/core/cpuinfo.cc
+++ lshw-B.02.18/src/core/cpuinfo.cc
@@ -13,6 +13,13 @@ __ID("@(#) $Id$");
 
 static int currentcpu = 0;
 
+static inline bool is_system_ppc_ibm(hwNode & node)
+{
+  string desc = node.getDescription();
+
+  return (desc == "PowerNV" || desc == "pSeries Guest" || desc == "pSeries 
LPAR");
+}
+
 static hwNode *getcpu(hwNode & node,
 int n = 0)
 {
@@ -33,6 +40,13 @@ int n = 0)
 return cpu;
   }
 
+  /*
+   * device-tree.cc creates all CPU nodes on Power Systems.
+   * Hence do not create new CPU nodes here.
+   */
+  if (is_system_ppc_ibm(node))
+return NULL;
+
   hwNode *core = node.getChild("core");
 
   if (core)
@@ -49,6 +63,20 @@ int n = 0)
 
 
 #ifdef __powerpc__

commit lshw for openSUSE:Factory

2017-06-07 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2017-06-07 09:56:03

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new (New)


Package is "lshw"

Wed Jun  7 09:56:03 2017 rev:5 rq:501438 version:B.02.18

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2017-05-10 
20:53:11.268239080 +0200
+++ /work/SRC/openSUSE:Factory/.lshw.new/lshw.changes   2017-06-07 
09:56:36.104692204 +0200
@@ -1,0 +2,5 @@
+Tue May 30 14:34:04 UTC 2017 - mplus...@suse.com
+
+- Recommend hwdata 
+
+---



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.ZuewcK/_old  2017-06-07 09:56:36.680610820 +0200
+++ /var/tmp/diff_new_pack.ZuewcK/_new  2017-06-07 09:56:36.684610255 +0200
@@ -33,6 +33,7 @@
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.4
+Recommends: hwdata
 Recommends: %{name}-lang
 %lang_package

commit lshw for openSUSE:Factory

2017-05-10 Thread root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2017-05-10 20:53:08

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new (New)


Package is "lshw"

Wed May 10 20:53:08 2017 rev:4 rq:493815 version:B.02.18

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2016-06-23 
13:36:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.lshw.new/lshw.changes   2017-05-10 
20:53:11.268239080 +0200
@@ -1,0 +2,7 @@
+Tue May  2 17:10:11 UTC 2017 - mplus...@suse.com
+
+- Simplify dependencies and build
+- Split lang subpackage
+- Prepare for SLE submission (fate#322439)
+
+---



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.a4tnH1/_old  2017-05-10 20:53:12.188109275 +0200
+++ /var/tmp/diff_new_pack.a4tnH1/_new  2017-05-10 20:53:12.200107583 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package lshw
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2013 Pascal Bleser 
 #
 # All modifications and additions to the file contributed by third parties
@@ -23,8 +23,8 @@
 Summary:HardWare LiSter
 License:GPL-2.0
 Group:  Hardware/Other
-Url:http://ezix.org/project/wiki/HardwareLiSter
-Source: http://ezix.org/software/files/lshw-%{version}.tar.gz
+Url:https://www.ezix.org/project/wiki/HardwareLiSter
+Source: https://www.ezix.org/software/files/lshw-%{version}.tar.gz
 Source1:lshw.desktop.in
 Source2:lshw.png
 BuildRequires:  gcc-c++
@@ -32,20 +32,9 @@
 BuildRequires:  libpng-devel
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(gail) >= 2.4.0
-BuildRequires:  pkgconfig(gdk-2.0) >= 2.4.0
-BuildRequires:  pkgconfig(gdk-x11-2.0) >= 2.4.0
-BuildRequires:  pkgconfig(gtk+-2.0) >= 2.4.0
-BuildRequires:  pkgconfig(gtk+-unix-print-2.0) >= 2.4.0
-BuildRequires:  pkgconfig(gtk+-x11-2.0) >= 2.4.0
-BuildRequires:  pkgconfig(libglade-2.0)
-BuildRequires:  pkgconfig(pango)
-BuildRequires:  pkgconfig(pangocairo)
-BuildRequires:  pkgconfig(pangoft2)
-BuildRequires:  pkgconfig(pangoxft)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(zlib)
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig(gtk+-2.0) >= 2.4
+Recommends: %{name}-lang
+%lang_package
 
 %description
 lshw (Hardware Lister) is a small tool to provide detailed informaton on the
@@ -89,34 +78,20 @@
 
 %build
 make \
-  PREFIX="%{_prefix}" \
   SBINDIR="%{_sbindir}" \
-  MANDIR="%{_mandir}" \
-  DATADIR="%{_datadir}" \
-  CXX="g++" \
-  CC="gcc" \
   RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" \
   STRIP=touch \
   all gui
 
 %install
-make \
-  %{?_smp_mflags} \
-  DESTDIR=%{buildroot} \
-  PREFIX="%{_prefix}" \
-  SBINDIR="%{_sbindir}" \
-  MANDIR="%{_mandir}" \
-  DATADIR="%{_datadir}" \
-  CXX="g++" \
-  CC="gcc" \
-  OPTFLAGS="%{optflags}" \
-  install install-gui
+%make_install install-gui
 
 install -d "%{buildroot}%{_datadir}/applications"
 sed 's,@@EXEC@@,%{_sbindir}/gtk-lshw,g' < "%{SOURCE1}" \
 > "%{buildroot}%{_datadir}/applications/%{name}.desktop"
 chmod 0644 "%{buildroot}%{_datadir}/applications/%{name}.desktop"
-install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png"
+install -D -p -m 0644 %{SOURCE2} \
+  %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 %suse_update_desktop_file -r "%{name}" System HardwareSettings
 # All of following are shipped by other packages as well
@@ -135,13 +110,16 @@
 %desktop_database_postun
 %icon_theme_cache_postun
 
-%files -f lshw.lang
+%files
 %defattr(-,root,root,0755)
 %doc README.md COPYING docs/TODO docs/Changelog docs/lshw.xsd
 %attr(0755,root,root) %{_sbindir}/lshw
 %dir %{_datadir}/lshw
 %{_mandir}/man1/lshw.1%{ext_man}
 
+%files lang -f %{name}.lang
+%defattr(-,root,root)
+
 %files gui
 %defattr(-,root,root,0755)
 %doc COPYING

commit lshw for openSUSE:Factory

2016-06-23 Thread h_root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2016-06-23 13:36:35

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new (New)


Package is "lshw"

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2016-04-30 
23:31:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.lshw.new/lshw.changes   2016-06-23 
13:36:39.0 +0200
@@ -1,0 +2,9 @@
+Mon Jun 20 11:25:53 UTC 2016 - mplus...@suse.com
+
+- Small spec file cleanup
+- Do not ship pci/usb/oter id's as they are provided by other
+  packages as well
+- Disable parallel building as it seems to cause random linking
+  failures (boo#985111)
+
+---



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.E8B0Fa/_old  2016-06-23 13:36:40.0 +0200
+++ /var/tmp/diff_new_pack.E8B0Fa/_new  2016-06-23 13:36:40.0 +0200
@@ -30,7 +30,7 @@
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libpng-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gail) >= 2.4.0
 BuildRequires:  pkgconfig(gdk-2.0) >= 2.4.0
@@ -88,20 +88,20 @@
 %setup -q
 
 %build
-make %{?_smp_mflags} \
+make \
 PREFIX="%{_prefix}" \
 SBINDIR="%{_sbindir}" \
 MANDIR="%{_mandir}" \
 DATADIR="%{_datadir}" \
 CXX="g++" \
 CC="gcc" \
-RPM_OPT_FLAGS="%{optflags}" \
+  RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" \
 STRIP=touch \
-all \
-gui
+  all gui
 
 %install
-make  %{?_smp_mflags} \
+make \
+  %{?_smp_mflags} \
 DESTDIR=%{buildroot} \
 PREFIX="%{_prefix}" \
 SBINDIR="%{_sbindir}" \
@@ -110,8 +110,7 @@
 CXX="g++" \
 CC="gcc" \
 OPTFLAGS="%{optflags}" \
-install \
-install-gui
+  install install-gui
 
 install -d "%{buildroot}%{_datadir}/applications"
 sed 's,@@EXEC@@,%{_sbindir}/gtk-lshw,g' < "%{SOURCE1}" \
@@ -120,6 +119,11 @@
 install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png"
 
 %suse_update_desktop_file -r "%{name}" System HardwareSettings
+# All of following are shipped by other packages as well
+rm -f %{buildroot}%{_datadir}/%{name}/pci.ids
+rm -f %{buildroot}%{_datadir}/%{name}/usb.ids
+rm -f %{buildroot}%{_datadir}/%{name}/oui.txt
+rm -f %{buildroot}%{_datadir}/%{name}/manuf.txt
 
 %find_lang lshw
 
@@ -136,8 +140,6 @@
 %doc README.md COPYING docs/TODO docs/Changelog docs/lshw.xsd
 %attr(0755,root,root) %{_sbindir}/lshw
 %dir %{_datadir}/lshw
-%{_datadir}/lshw/*.txt
-%{_datadir}/lshw/*.ids
 %{_mandir}/man1/lshw.1%{ext_man}
 
 %files gui

commit lshw for openSUSE:Factory

2016-04-30 Thread h_root 
Hello community,

here is the log from the commit of package lshw for openSUSE:Factory checked in 
at 2016-04-30 23:31:10

Comparing /work/SRC/openSUSE:Factory/lshw (Old)
 and  /work/SRC/openSUSE:Factory/.lshw.new (New)


Package is "lshw"

Changes:

--- /work/SRC/openSUSE:Factory/lshw/lshw.changes2015-08-01 
11:35:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.lshw.new/lshw.changes   2016-04-30 
23:31:14.0 +0200
@@ -1,0 +2,12 @@
+Tue Apr 26 19:39:38 UTC 2016 - mplus...@suse.com
+
+- Update to B.02.18
+  * no changelog available
+- Use pkgconfig style dependencies
+- Update dependencies
+- Build gui and cli at same time
+- Drop no longer needed patches
+  * lshw-gcc43.patch
+  * lshw-stack-corruption.patch
+
+---

Old:

  lshw-B.02.17.tar.gz
  lshw-gcc43.patch
  lshw-stack-corruption.patch

New:

  lshw-B.02.18.tar.gz



Other differences:
--
++ lshw.spec ++
--- /var/tmp/diff_new_pack.tkPa6a/_old  2016-04-30 23:31:15.0 +0200
+++ /var/tmp/diff_new_pack.tkPa6a/_new  2016-04-30 23:31:15.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package lshw
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2013 Pascal Bleser 
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
 
 
 Name:   lshw
-Version:B.02.17
+Version:B.02.18
 Release:0
 Summary:HardWare LiSter
 License:GPL-2.0
@@ -27,18 +27,24 @@
 Source: http://ezix.org/software/files/lshw-%{version}.tar.gz
 Source1:lshw.desktop.in
 Source2:lshw.png
-Patch1: lshw-gcc43.patch
-Patch2: lshw-stack-corruption.patch
 BuildRequires:  gcc-c++
-BuildRequires:  gtk2-devel >= 2.4.0
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  libglade2-devel
 BuildRequires:  libpng-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  pango-devel
-BuildRequires:  sqlite3-devel
+BuildRequires:  pkg-config
 BuildRequires:  update-desktop-files
-BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(gail) >= 2.4.0
+BuildRequires:  pkgconfig(gdk-2.0) >= 2.4.0
+BuildRequires:  pkgconfig(gdk-x11-2.0) >= 2.4.0
+BuildRequires:  pkgconfig(gtk+-2.0) >= 2.4.0
+BuildRequires:  pkgconfig(gtk+-unix-print-2.0) >= 2.4.0
+BuildRequires:  pkgconfig(gtk+-x11-2.0) >= 2.4.0
+BuildRequires:  pkgconfig(libglade-2.0)
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(pangocairo)
+BuildRequires:  pkgconfig(pangoft2)
+BuildRequires:  pkgconfig(pangoxft)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(zlib)
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -59,6 +65,10 @@
 Group:  Hardware/Other
 Requires:   %{name} = %{version}-%{release}
 Requires:   hicolor-icon-theme
+Requires(post): hicolor-icon-theme
+Requires(post): update-desktop-files
+Requires(postun): hicolor-icon-theme
+Requires(postun): update-desktop-files
 
 %description gui
 lshw (Hardware Lister) is a small tool to provide detailed informaton on the
@@ -76,8 +86,6 @@
 
 %prep
 %setup -q
-%patch1
-%patch2
 
 %build
 make %{?_smp_mflags} \
@@ -89,32 +97,11 @@
 CC="gcc" \
 RPM_OPT_FLAGS="%{optflags}" \
 STRIP=touch \
-all
-
-make %{?_smp_mflags} \
-PREFIX="%{_prefix}" \
-SBINDIR="%{_sbindir}" \
-MANDIR="%{_mandir}" \
-DATADIR="%{_datadir}" \
-CXX="g++" \
-CC="gcc" \
-RPM_OPT_FLAGS="%{optflags}" \
-STRIP=touch \
+all \
 gui
 
 %install
-make %{?_smp_flags} \
-DESTDIR=%{buildroot} \
-PREFIX="%{_prefix}" \
-SBINDIR="%{_sbindir}" \
-MANDIR="%{_mandir}" \
-DATADIR="%{_datadir}" \
-CXX="g++" \
-CC="gcc" \
-OPTFLAGS="%{optflags}" \
-install
-
-make %{?_smp_flags} \
+make  %{?_smp_mflags} \
 DESTDIR=%{buildroot} \
 PREFIX="%{_prefix}" \
 SBINDIR="%{_sbindir}" \
@@ -123,6 +110,7 @@
 CXX="g++" \
 CC="gcc" \
 OPTFLAGS="%{optflags}" \
+install \
 install-gui
 
 install -d "%{buildroot}%{_datadir}/applications"
@@ -145,7 +133,7 @@
 
 %files -f lshw.lang
 %defattr(-,root,root,0755)
-%doc README COPYING docs/TODO docs/Changelog docs/lshw.xsd
+%doc README.md COPYING docs/TODO docs/Changelog docs/lshw.xsd
 %attr(0755,root,root) %{_sbindir}/lshw
 %dir %{_datadir}/lshw
 %{_datadir}/lshw/*.txt

++ lshw-B.02.17.tar.gz -> lshw-B.02.18.tar.gz ++
 490414 lines of diff (skipped)