Accepting request 403782 from hardware

- Small spec file cleanup
- Do not ship pci/usb/oter id's as they are provided by other
  packages as well
- Disable parallel building as it seems to cause random linking
  failures (boo#985111)

OBS-URL: https://build.opensuse.org/request/show/403782
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lshw?expand=0&rev=3

lshw.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jun 20 11:25:53 UTC 2016 - mpluskal@suse.com
+
+- Small spec file cleanup
+- Do not ship pci/usb/oter id's as they are provided by other
+  packages as well
+- Disable parallel building as it seems to cause random linking
+  failures (boo#985111)
+
 -------------------------------------------------------------------
 Tue Apr 26 19:39:38 UTC 2016 - mpluskal@suse.com
 

lshw.spec

@@ -30,7 +30,7 @@ Source2:        lshw.png
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libpng-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gail) >= 2.4.0
 BuildRequires:  pkgconfig(gdk-2.0) >= 2.4.0
@@ -88,30 +88,29 @@ http://www.ezix.org/software/lshw.html
 %setup -q
 
 %build
-make %{?_smp_mflags} \
+make \
-    PREFIX="%{_prefix}" \
+  PREFIX="%{_prefix}" \
-    SBINDIR="%{_sbindir}" \
+  SBINDIR="%{_sbindir}" \
-    MANDIR="%{_mandir}" \
+  MANDIR="%{_mandir}" \
-    DATADIR="%{_datadir}" \
+  DATADIR="%{_datadir}" \
-    CXX="g++" \
+  CXX="g++" \
-    CC="gcc" \
+  CC="gcc" \
-    RPM_OPT_FLAGS="%{optflags}" \
+  RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" \
-    STRIP=touch \
+  STRIP=touch \
-    all \
+  all gui
-    gui
 
 %install
-make  %{?_smp_mflags} \
+make \
-    DESTDIR=%{buildroot} \
+  %{?_smp_mflags} \
-    PREFIX="%{_prefix}" \
+  DESTDIR=%{buildroot} \
-    SBINDIR="%{_sbindir}" \
+  PREFIX="%{_prefix}" \
-    MANDIR="%{_mandir}" \
+  SBINDIR="%{_sbindir}" \
-    DATADIR="%{_datadir}" \
+  MANDIR="%{_mandir}" \
-    CXX="g++" \
+  DATADIR="%{_datadir}" \
-    CC="gcc" \
+  CXX="g++" \
-    OPTFLAGS="%{optflags}" \
+  CC="gcc" \
-    install \
+  OPTFLAGS="%{optflags}" \
-    install-gui
+  install install-gui
 
 install -d "%{buildroot}%{_datadir}/applications"
 sed 's,@@EXEC@@,%{_sbindir}/gtk-lshw,g' < "%{SOURCE1}" \
@@ -120,6 +119,11 @@ chmod 0644 "%{buildroot}%{_datadir}/applications/%{name}.desktop"
 install -D -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
+rm -f %{buildroot}%{_datadir}/%{name}/pci.ids
+rm -f %{buildroot}%{_datadir}/%{name}/usb.ids
+rm -f %{buildroot}%{_datadir}/%{name}/oui.txt
+rm -f %{buildroot}%{_datadir}/%{name}/manuf.txt
 
 %find_lang lshw
 
@@ -136,8 +140,6 @@ install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png"
 %doc README.md COPYING docs/TODO docs/Changelog docs/lshw.xsd
 %attr(0755,root,root) %{_sbindir}/lshw
 %dir %{_datadir}/lshw
-%{_datadir}/lshw/*.txt
-%{_datadir}/lshw/*.ids
 %{_mandir}/man1/lshw.1%{ext_man}
 
 %files gui