Accepting request 573781 from home:pluskalm:branches:hardware

- Drop not needed post macros
- Add ppc enablement patches (bsc#1079846):
  * lshw-cpuinfo.patch
  * lshw-devtree_cpunodes.patch 
  * lshw-devtree_machine_describtion.patch
  * lshw-dimminfo.patch

OBS-URL: https://build.opensuse.org/request/show/573781
OBS-URL: https://build.opensuse.org/package/show/hardware/lshw?expand=0&rev=18
This commit is contained in:
Martin Pluskal
2018-02-07 15:59:49 +00:00
committed by Git OBS Bridge
parent 1dbaf2cf14
commit 1c6c3c94bc
6 changed files with 579 additions and 11 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package lshw
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 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,18 +23,26 @@ Release: 0
Summary: HardWare LiSter
License: GPL-2.0
Group: Hardware/Other
Url: https://www.ezix.org/project/wiki/HardwareLiSter
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
# PATCH-FIX-UPSTREAM -- lshw-dimminfo.patch bsc#1079846
Patch0: lshw-dimminfo.patch
# PATCH-FIX-UPSTREAM -- lshw-devtree_cpunodes.patch bsc#1079846
Patch1: lshw-devtree_cpunodes.patch
# PATCH-FIX-UPSTREAM -- lshw-devtree_machine_describtion.patch bsc#1079846
Patch2: lshw-devtree_machine_describtion.patch
# PATCH-FIX-UPSTREAM -- lshw-cpuinfo.patch bsc#1079846
Patch3: lshw-cpuinfo.patch
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: libpng-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(gtk+-2.0) >= 2.4
Recommends: hwdata
Recommends: %{name}-lang
Recommends: hwdata
%lang_package
%description
@@ -76,6 +84,10 @@ http://www.ezix.org/software/lshw.html
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
make \
@@ -103,14 +115,6 @@ rm -f %{buildroot}%{_datadir}/%{name}/manuf.txt
%find_lang lshw
%post gui
%desktop_database_post
%icon_theme_cache_post
%postun gui
%desktop_database_postun
%icon_theme_cache_postun
%files
%defattr(-,root,root,0755)
%doc README.md COPYING docs/TODO docs/Changelog docs/lshw.xsd