Release B.02.19.2-9

Fix patch issue in B.02.19.2-8

Related: bz2068386
Related: bz2098463

Signed-off-by: Tao Liu <ltao@redhat.com>
This commit is contained in:
Tao Liu 2022-07-19 17:18:38 +08:00
parent a8aba2be1d
commit ea389fe292
3 changed files with 16 additions and 51 deletions

View File

@ -12,55 +12,9 @@ updates.
Signed-off-by: Stewart Smith trawets@amazon.com Signed-off-by: Stewart Smith trawets@amazon.com
--- ---
src/Makefile | 10 ++++++++--
src/core/Makefile | 5 ++++-
src/core/version.cc | 9 ++++++++- src/core/version.cc | 9 ++++++++-
3 files changed, 20 insertions(+), 4 deletions(-) 1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 220f3f6..ac726d0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -24,7 +24,10 @@ export ZLIB
CXX?=$(CROSS_COMPILE)c++
PKG_CONFIG ?= pkg-config
INCLUDES=-I./core/
-DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" -DVERSION=\"$(VERSION)\"
+ifneq ($(NO_VERSION_CHECK), 1)
+REMOTE_VERSION_CHECK?=-DREMOTE_VERSION_CHECK
+endif
+DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" -DVERSION=\"$(VERSION)\" $(REMOTE_VERSION_CHECK)
CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
ifeq ($(SQLITE), 1)
CXXFLAGS+= -DSQLITE $(shell $(PKG_CONFIG) --cflags sqlite3)
@@ -37,7 +40,10 @@ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
LDFLAGS+= -Wl,--as-needed
endif
LDSTATIC=-static
-LIBS+=-llshw -lresolv
+LIBS+=-llshw
+ifneq ($(NO_VERSION_CHECK), 1)
+LIBS+=-lresolv
+endif
ifeq ($(SQLITE), 1)
LIBS+= $(shell $(PKG_CONFIG) --libs sqlite3)
endif
diff --git a/src/core/Makefile b/src/core/Makefile
index a8ed0cf..5035062 100644
--- a/src/core/Makefile
+++ b/src/core/Makefile
@@ -2,7 +2,10 @@ PACKAGENAME?=lshw
CXX?=$(CROSS_COMPILE)c++
INCLUDES=
-DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
+ifneq ($(NO_VERSION_CHECK), 1)
+REMOTE_VERSION_CHECK?=-DREMOTE_VERSION_CHECK
+endif
+DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" $(REMOTE_VERSION_CHECK)
CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
LDFLAGS=
LDSTATIC=
diff --git a/src/core/version.cc b/src/core/version.cc diff --git a/src/core/version.cc b/src/core/version.cc
index 1f64b3a..ea8dd4a 100644 index 1f64b3a..ea8dd4a 100644
--- a/src/core/version.cc --- a/src/core/version.cc

View File

@ -43,7 +43,7 @@ new file mode 100644
index 0000000..3b1d4d6 index 0000000..3b1d4d6
--- /dev/null --- /dev/null
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -0,0 +1,43 @@ @@ -0,0 +1,44 @@
+cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.0)
+ +
+project(lshw) +project(lshw)
@ -71,6 +71,7 @@ index 0000000..3b1d4d6
+option(NOLOGO "Don't install vendor logos" OFF) +option(NOLOGO "Don't install vendor logos" OFF)
+option(STATIC "Do a static (will disable other features)" OFF) +option(STATIC "Do a static (will disable other features)" OFF)
+option(POLICYKIT "Install PolicyKit file and pfexec wrapper" OFF) +option(POLICYKIT "Install PolicyKit file and pfexec wrapper" OFF)
+option(REMOTE_VERSION_CHECK "Enable remote version check" OFF)
+ +
+include(GNUInstallDirs) +include(GNUInstallDirs)
+set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Install prefix") +set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Install prefix")
@ -300,7 +301,7 @@ new file mode 100644
index 0000000..8b97a16 index 0000000..8b97a16
--- /dev/null --- /dev/null
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -0,0 +1,103 @@ @@ -0,0 +1,108 @@
+if(STATIC) +if(STATIC)
+ set(ZLIB OFF) + set(ZLIB OFF)
+ set(SQLITE OFF) + set(SQLITE OFF)
@ -385,7 +386,12 @@ index 0000000..8b97a16
+ set_target_properties(lshw PROPERTIES LINK_FLAGS "-static" ) + set_target_properties(lshw PROPERTIES LINK_FLAGS "-static" )
+endif() +endif()
+ +
+target_link_libraries(lshw ${SQLITE3_LIBRARIES} ${Z_LIBRARIES} core resolv) +if(REMOTE_VERSION_CHECK)
+ add_compile_definitions(REMOTE_VERSION_CHECK)
+ target_link_libraries(lshw ${SQLITE3_LIBRARIES} ${Z_LIBRARIES} core resolv)
+else()
+ target_link_libraries(lshw ${SQLITE3_LIBRARIES} ${Z_LIBRARIES} core)
+endif()
+ +
+if(NOT ZLIB) +if(NOT ZLIB)
+ if(HWDATA) + if(HWDATA)

View File

@ -2,7 +2,7 @@
Summary: Hardware lister Summary: Hardware lister
Name: lshw Name: lshw
Version: B.02.19.2 Version: B.02.19.2
Release: 8%{?dist} Release: 9%{?dist}
License: GPLv2 License: GPLv2
URL: http://ezix.org/project/wiki/HardwareLiSter URL: http://ezix.org/project/wiki/HardwareLiSter
Source0: http://www.ezix.org/software/files/lshw-%{version}.tar.gz Source0: http://www.ezix.org/software/files/lshw-%{version}.tar.gz
@ -175,6 +175,8 @@ format.
%patch71 -p1 %patch71 -p1
%patch72 -p1 %patch72 -p1
%patch73 -p1 %patch73 -p1
%patch74 -p1
%patch75 -p1
%build %build
%cmake -DNOLOGO=ON -DHWDATA=OFF -DPOLICYKIT=ON -DSQLITE=ON -DBUILD_SHARED_LIBS=OFF -GNinja %cmake -DNOLOGO=ON -DHWDATA=OFF -DPOLICYKIT=ON -DSQLITE=ON -DBUILD_SHARED_LIBS=OFF -GNinja
@ -221,6 +223,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%{_datadir}/polkit-1/actions/org.ezix.lshw.gui.policy %{_datadir}/polkit-1/actions/org.ezix.lshw.gui.policy
%changelog %changelog
* Tue Jul 19 2022 Tao Liu <ltao@redhat.com> - B.02.19.2-9
- Fix patch issue in B.02.19.2-8
* Fri Jul 15 2022 Tao Liu <ltao@redhat.com> - B.02.19.2-8 * Fri Jul 15 2022 Tao Liu <ltao@redhat.com> - B.02.19.2-8
- Update lshw to upstream latest(d76afbaaf40) - Update lshw to upstream latest(d76afbaaf40)