- up to B.02.18

- removed unnecessary lshw-gcc.patch
- patch renumbering

diff --git a/lshw-gcc.patch b/lshw-gcc.patch
deleted file mode 100644 (file)
index 10d59b7..0000000
--- a/lshw-gcc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/abi.cc
-+++ src/core/abi.cc
-@@ -9,6 +9,7 @@
- #include "osutils.h"
- #include <unistd.h>
- #include <dirent.h>
-+#include <stdlib.h>
- 
- __ID("@(#) $Id$");
- 

diff --git a/lshw.spec b/lshw.spec
index 2beda1666518cad6b2ea455830f9c6da62e611fa..8cd67ec86cd4ad7c478cb5acb2076d96ad145bc0 100644 (file)
--- a/lshw.spec
+++ b/lshw.spec
@@ -8,16 +8,15 @@
 Summary:       Hardware Lister
 Summary(pl.UTF-8):     Narzędzie wypisujące sprzęt
 Name:          lshw
-Version:       B.02.17
-Release:       2
+Version:       B.02.18
+Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://ezix.org/software/files/%{name}-%{version}.tar.gz
-# Source0-md5: a5feb796cb302850eaf5b4530888e3ed
-Patch0:                %{name}-gcc.patch
-Patch1:                sanity.patch
-Patch2:                hwdata.patch
-Patch3:                %{name}-buffer_overflow.patch
+# Source0-md5: 8671c6d94d6324a744b7f21f1bfecfd2
+Patch0:                sanity.patch
+Patch1:                hwdata.patch
+Patch2:                %{name}-buffer_overflow.patch
 URL:           http://ezix.org/project/wiki/HardwareLiSter
 %{?with_gui:BuildRequires:     gtk+2-devel >= 1:2.0}
 BuildRequires: libstdc++-devel
@@ -68,10 +67,9 @@ lshw w wersji GTK+.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__make} -C src \
@@ -108,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc docs/TODO docs/Changelog docs/lshw.xsd README
+%doc docs/TODO docs/Changelog docs/lshw.xsd README.md
 %attr(755,root,root) %{_sbindir}/%{name}
 %{_datadir}/%{name}
 %{_mandir}/man1/lshw.1*

diff --git a/sanity.patch b/sanity.patch
index 7998c5613586c534b8f59a610163f515293ba99f..c05c8dfc88fe50bc9380e57fc1a29d186145c1ff 100644 (file)
--- a/sanity.patch
+++ b/sanity.patch
@@ -1,5 +1,6 @@
---- lshw-B.02.16.orig/src/core/Makefile
-+++ lshw-B.02.16/src/core/Makefile
+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
  
@@ -13,8 +14,9 @@
  LDSTATIC=
  LIBS=
  
---- lshw-B.02.16.orig/src/gui/Makefile
-+++ lshw-B.02.16/src/gui/Makefile
+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
 @@ -1,5 +1,7 @@
  PACKAGENAME?=lshw
  
@@ -31,11 +33,10 @@
 +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 -lsqlite3 $(GTKLIBS)
+ LIBS=-L../core -llshw -lresolv $(GTKLIBS)
 -LDFLAGS=
 -ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
 -      LDFLAGS+= -Wl,--as-needed
-+LIBS=-L../core -llshw -lresolv $(GTKLIBS)
 +
 +ifeq ($(SQLITE), 1)
 +      CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
@@ -53,8 +54,9 @@
  clean:
        rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak
  
---- lshw-B.02.16.orig/src/Makefile
-+++ lshw-B.02.16/src/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++
  INCLUDES=-I./core/
@@ -135,5 +137,5 @@
 +      $(MAKE) -C core clean
 +      $(MAKE) -C gui clean
  
- .timestamp:
-       date --utc +%Y%m%d%H%M%S > $@
+ depend:
+       @makedepend -Y $(SRCS) 2> /dev/null > /dev/null