From afdb790d8d46689a2456c741ff7c4a24ee820a8e10ed3c3a638a2d1cf95194f4 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 2 May 2017 17:12:18 +0000
Subject: [PATCH] - Simplify dependencies and build - Split lang subpackage -
 Prepare for SLE submission (fate#322439)

OBS-URL: https://build.opensuse.org/package/show/hardware/lshw?expand=0&rev=14
---
 lshw.changes |  7 +++++++
 lshw.spec    | 48 +++++++++++++-----------------------------------
 2 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/lshw.changes b/lshw.changes
index 7af8e73..b0c6abe 100644
--- a/lshw.changes
+++ b/lshw.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May  2 17:10:11 UTC 2017 - mpluskal@suse.com
+
+- Simplify dependencies and build
+- Split lang subpackage
+- Prepare for SLE submission (fate#322439)
+
 -------------------------------------------------------------------
 Mon Jun 20 11:25:53 UTC 2016 - mpluskal@suse.com
 
diff --git a/lshw.spec b/lshw.spec
index 197e102..d349365 100644
--- a/lshw.spec
+++ b/lshw.spec
@@ -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 <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -23,8 +23,8 @@ Release:        0
 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:  hicolor-icon-theme
 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 @@ http://www.ezix.org/software/lshw.html
 
 %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 @@ rm -f %{buildroot}%{_datadir}/%{name}/manuf.txt
 %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