[packages/lshw] - updated to B.02.19.2

adamg adamg at pld-linux.org
Sun Apr 30 19:02:34 CEST 2023 

commit dd76d1741869d15efeda88ae5ac86aa8625af07b
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date:   Sun Apr 30 13:01:54 2023 +0200

    - updated to B.02.19.2

 hwdata.patch |  2 +-
 lshw.spec    | 13 ++++------
 sanity.patch | 77 +++++++++++++++++++++++++++---------------------------------
 3 files changed, 41 insertions(+), 51 deletions(-)
---
diff --git a/lshw.spec b/lshw.spec
index 2ab6954..065e92a 100644
--- a/lshw.spec
+++ b/lshw.spec
@@ -8,16 +8,16 @@
 Summary:	Hardware Lister
 Summary(pl.UTF-8):	Narzędzie wypisujące sprzęt
 Name:		lshw
-Version:	B.02.18
+Version:	B.02.19.2
 Release:	1
 License:	GPL v2
 Group:		Applications/System
-Source0:	http://ezix.org/software/files/%{name}-%{version}.tar.gz
-# Source0-md5:	8671c6d94d6324a744b7f21f1bfecfd2
+Source0:	https://ezix.org/software/files/%{name}-%{version}.tar.gz
+# Source0-md5:	8c70d46e906688309095c73ecb9396e3
 Patch0:		sanity.patch
 Patch1:		hwdata.patch
 Patch2:		%{name}-buffer_overflow.patch
-URL:		http://ezix.org/project/wiki/HardwareLiSter
+URL:		https://ezix.org/project/wiki/HardwareLiSter
 %{?with_gui:BuildRequires:	gtk+2-devel >= 1:2.0}
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
@@ -66,10 +66,7 @@ GTK+ version of lshw.
 lshw w wersji GTK+.
 
 %prep
-# tarball contains lshw.spec outside package subdirectory, skip it to avoid leaving junk
-# TODO: use plain setup -q when junk is no longer present
-%setup -q -c -T
-%{__tar} xzf %{SOURCE0} --exclude=lshw.spec -C ..
+%setup -q
 
 %patch0 -p1
 %patch1 -p1
diff --git a/hwdata.patch b/hwdata.patch
index ed4c660..81c5527 100644
--- a/hwdata.patch
+++ b/hwdata.patch
@@ -9,7 +9,7 @@ diff -ur lshw-B.02.17.orig/src/core/pci.cc lshw-B.02.17/src/core/pci.cc
 +#define PCIID_PATH "/lib/hwdata/pci.ids"
  
  #define PCI_CLASS_REVISION      0x08              /* High 24 bits are class, low 8 revision */
- #define PCI_VENDOR_ID           0x00    /* 16 bits */
+ #define PCI_VENDOR_ID           0x00              /* 16 bits */
 diff -ur lshw-B.02.17.orig/src/core/usb.cc lshw-B.02.17/src/core/usb.cc
 --- lshw-B.02.17.orig/src/core/usb.cc	2012-10-24 16:49:18.000000000 +0000
 +++ lshw-B.02.17/src/core/usb.cc	2014-07-14 20:36:22.940000000 +0000
diff --git a/sanity.patch b/sanity.patch
index c05c8df..8ac706b 100644
--- a/sanity.patch
+++ b/sanity.patch
@@ -1,19 +1,3 @@
-diff -ruNp lshw-B.02.18.orig/src/core/Makefile lshw-B.02.18/src/core/Makefile
---- lshw-B.02.18.orig/src/core/Makefile	2016-04-22 21:49:30.000000000 +0200
-+++ lshw-B.02.18/src/core/Makefile	2017-06-17 21:34:48.388265696 +0200
-@@ -1,10 +1,9 @@
- PACKAGENAME?=lshw
- 
--CXX=c++
-+CXX?=c++
- INCLUDES=
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
--LDFLAGS=
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- LDSTATIC=
- LIBS=
- 
 diff -ruNp lshw-B.02.18.orig/src/gui/Makefile lshw-B.02.18/src/gui/Makefile
 --- lshw-B.02.18.orig/src/gui/Makefile	2016-04-22 21:49:30.000000000 +0200
 +++ lshw-B.02.18/src/gui/Makefile	2017-06-17 21:37:34.254783020 +0200
@@ -22,28 +6,29 @@ diff -ruNp lshw-B.02.18.orig/src/gui/Makefile lshw-B.02.18/src/gui/Makefile
  
 +SQLITE?=0
 +
- CXX?=c++
- CC?=cc
+ CXX?=$(CROSS_COMPILE)c++
+ CC?=$(CROSS_COMPILE)cc
  STRIP?=strip
-@@ -8,13 +10,14 @@ OBJCOPY?=objcopy
+@@ -8,7 +10,7 @@
  DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
  GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
  INCLUDES=-I../core $(GTKINCLUDES)
 -CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- CFLAGS=$(CXXFLAGS) $(DEFINES)
- GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs)
- LIBS=-L../core -llshw -lresolv $(GTKLIBS)
++CXXFLAGS += -g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+ ifeq ($(SQLITE), 1)
+ 	CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
+ endif
+@@ -18,10 +20,6 @@
+ ifeq ($(SQLITE), 1)
+ 	LIBS+= $(shell pkg-config --libs sqlite3)
+ endif
 -LDFLAGS=
 -ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
 -	LDFLAGS+= -Wl,--as-needed
-+
-+ifeq ($(SQLITE), 1)
-+	CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
-+	LIBS+= $(shell pkg-config --libs sqlite3)
- endif
+-endif
  
  OBJS = gtk-lshw.o callbacks.o engine.o print-gui.o stock.o
+ SRCS = $(OBJS:.o=.c)
 @@ -39,8 +42,7 @@ gtk-$(PACKAGENAME): $(OBJS) ../core/libl
  	$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
  
@@ -57,31 +42,39 @@ diff -ruNp lshw-B.02.18.orig/src/gui/Makefile lshw-B.02.18/src/gui/Makefile
 diff -ruNp lshw-B.02.18.orig/src/Makefile lshw-B.02.18/src/Makefile
 --- lshw-B.02.18.orig/src/Makefile	2016-04-22 21:49:30.000000000 +0200
 +++ lshw-B.02.18/src/Makefile	2017-06-17 21:34:48.390265690 +0200
-@@ -21,11 +21,11 @@ export SQLITE
- CXX?=c++
+@@ -23,14 +23,14 @@
+ CXX?=$(CROSS_COMPILE)c++
  INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
+ DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" -DVERSION=\"$(VERSION)\"
 -CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
++CXXFLAGS += -g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
  ifeq ($(SQLITE), 1)
  	CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
  endif
--LDFLAGS=-L./core/ -g
-+LDFLAGS += -L./core/
+ ifeq ($(ZLIB), 1)
+ 	CXXFLAGS+= -DZLIB $(shell pkg-config --cflags zlib)
+ endif
+-LDFLAGS+=-L./core/ -g
++LDFLAGS+=-L./core/
  ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
  	LDFLAGS+= -Wl,--as-needed
  endif
-@@ -39,27 +39,25 @@ export CXXFLAGS
+@@ -47,13 +47,7 @@
  export LIBS
  export LDFLAGS
  
--DATAFILES = pci.ids usb.ids oui.txt manuf.txt
+-ifeq ($(ZLIB), 1)
+-DATAFILES = pci.ids.gz usb.ids.gz oui.txt.gz manuf.txt.gz pnp.ids.gz pnpid.txt.gz
+-else
+-DATAFILES = pci.ids usb.ids oui.txt manuf.txt pnp.ids pnpid.txt
+-endif
 -
 -all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)
 +all: $(PACKAGENAME) $(PACKAGENAME).1
  
  .cc.o:
  	$(CXX) $(CXXFLAGS) -c $< -o $@
+@@ -63,18 +57,18 @@
  
  .PHONY: core
  core:
@@ -103,7 +96,7 @@ diff -ruNp lshw-B.02.18.orig/src/Makefile lshw-B.02.18/src/Makefile
  
  .PHONY: nologo
  nologo:
-@@ -70,7 +68,6 @@ static: $(PACKAGENAME)-static
+@@ -85,7 +79,6 @@
  
  $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
  	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
@@ -111,9 +104,9 @@ diff -ruNp lshw-B.02.18.orig/src/Makefile lshw-B.02.18/src/Makefile
  
  .PHONY: compressed
  compressed: $(PACKAGENAME)-compressed
-@@ -93,14 +90,13 @@ oui.txt:
- manuf.txt:
- 	wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf
+@@ -114,14 +107,13 @@
+ pnpid.txt:
+ 	wget http://www-pc.uni-regensburg.de/hardware/TECHNIK/PCI_PNP/pnpid.txt
  
 -install: all
 +install:
@@ -128,10 +121,10 @@ diff -ruNp lshw-B.02.18.orig/src/Makefile lshw-B.02.18/src/Makefile
  
  install-gui: gui
  	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-@@ -112,8 +108,8 @@ install-gui: gui
- 	
+@@ -134,8 +126,8 @@
  clean:
  	rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed
+ 	rm -f $(addsuffix .gz,$(DATAFILES))
 -	make -C core clean
 -	make -C gui clean
 +	$(MAKE) -C core clean
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lshw.git/commitdiff/dd76d1741869d15efeda88ae5ac86aa8625af07b

More information about the pld-cvs-commit mailing list