Accepting request 391755 from home:pluskalm:branches:hardware

OBS-URL: https://build.opensuse.org/request/show/391755
OBS-URL: https://build.opensuse.org/package/show/hardware/lshw?expand=0&rev=8

lshw-B.02.17.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb9cc053fa0f1e78685cb695596e73931bfb55d2377e3bc3b8b94aff4c5a489c
-size 2005737

lshw-B.02.18.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f
+size 2322176

lshw-gcc43.patch

@@ -1,23 +0,0 @@
---- src/core/abi.cc.orig	2010-03-15 21:26:20.000000000 +0100
-+++ src/core/abi.cc	2013-08-06 21:05:08.693772583 +0200
-@@ -11,6 +11,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <dirent.h>
-+#include <cstdlib>
- 
- __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
- 
-@@ -38,10 +39,10 @@
-     for(i=0; i<n; i++)
-     {
-       system.addCapability(namelist[i]->d_name);
--      free(namelist[i]);
-+      std::free(namelist[i]);
-     }
-     if(namelist)
--      free(namelist);
-+      std::free(namelist);
-   }
- 
-   popd();

lshw-stack-corruption.patch

@@ -1,10 +0,0 @@
---- src/core/fat.cc
-+++ src/core/fat.cc
-@@ -81,6 +81,7 @@
- 			uint8_t dummy2[164];
- 			uint8_t pmagic[2];
- 		} __attribute__((__packed__)) fat32;
-+		char sector[512];	// to make sure the whole struct is at least 512 bytes long
- 	} __attribute__((__packed__)) type;
- } __attribute__((__packed__));
- 

lshw.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Apr 26 19:39:38 UTC 2016 - mpluskal@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
+
 -------------------------------------------------------------------
 Fri Jul 24 10:48:58 UTC 2015 - mpluskal@suse.com
 

lshw.spec

@@ -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 <pascal.bleser@opensuse.org>
 #
 # 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 @@ Url:            http://ezix.org/project/wiki/HardwareLiSter
 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:  pkg-config
-BuildRequires:  pango-devel
-BuildRequires:  sqlite3-devel
 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 @@ Summary:        HardWare LiSter (GUI Frontend)
 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 @@ http://www.ezix.org/software/lshw.html
 
 %prep
 %setup -q
-%patch1
-%patch2
 
 %build
 make %{?_smp_mflags} \
@@ -89,32 +97,11 @@ make %{?_smp_mflags} \
     CC="gcc" \
     RPM_OPT_FLAGS="%{optflags}" \
     STRIP=touch \
-    all
+    all \
-
-make %{?_smp_mflags} \
-    PREFIX="%{_prefix}" \
-    SBINDIR="%{_sbindir}" \
-    MANDIR="%{_mandir}" \
-    DATADIR="%{_datadir}" \
-    CXX="g++" \
-    CC="gcc" \
-    RPM_OPT_FLAGS="%{optflags}" \
-    STRIP=touch \
     gui
 
 %install
-make %{?_smp_flags} \
+make  %{?_smp_mflags} \
-    DESTDIR=%{buildroot} \
-    PREFIX="%{_prefix}" \
-    SBINDIR="%{_sbindir}" \
-    MANDIR="%{_mandir}" \
-    DATADIR="%{_datadir}" \
-    CXX="g++" \
-    CC="gcc" \
-    OPTFLAGS="%{optflags}" \
-    install
-
-make %{?_smp_flags} \
     DESTDIR=%{buildroot} \
     PREFIX="%{_prefix}" \
     SBINDIR="%{_sbindir}" \
@@ -123,6 +110,7 @@ make %{?_smp_flags} \
     CXX="g++" \
     CC="gcc" \
     OPTFLAGS="%{optflags}" \
+    install \
     install-gui
 
 install -d "%{buildroot}%{_datadir}/applications"
@@ -145,7 +133,7 @@ install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png"
 
 %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