diff --git a/lshw.spec b/lshw.spec index a563b32..ac6ac62 100644 --- a/lshw.spec +++ b/lshw.spec @@ -1,21 +1,17 @@ Name: lshw Version: B.02.18 -Release: 19 +Release: 20 Summary: Hardware lister License: GPLv2 URL: http://ezix.org/project/wiki/HardwareLiSter Source0: http://www.ezix.org/software/files/%{name}-%{version}.tar.gz Patch0: lshw-B.02.18-scandir.patch -Patch1: lshw-B.02.18-20cda77.patch -Patch2: lshw-B.02.18-revert-json.patch -Patch3: lshw-B.02.18-cmake.patch +Patch1: lshw-B.02.18-revert-json.patch BuildRequires: gcc gcc-c++ cmake gettext BuildRequires: desktop-file-utils libappstream-glib ninja-build BuildRequires: python3-devel gtk2-devel >= 2.4 Requires: hwdata -Provides: %{name}-gui = %{version}-%{release} -Obsoletes: %{name}-gui < %{version}-%{release} %description lshw (Hardware Lister) is a small tool to provide detailed information @@ -33,46 +29,29 @@ BuildArch: noarch The %{name}-help package contains doc files for %{name}. %prep -%setup -q -%patch00 -p1 -%patch01 -p1 -%patch02 -R -p1 -%patch03 -p1 +%autosetup -p1 %build -mkdir -p build && cd build -%cmake .. -DNOLOGO=ON -DHWDATA=OFF -DPOLICYKIT=ON -DBUILD_SHARED_LIBS=OFF -GNinja -%ninja_build +%make_build %install -cd build -%ninja_install +%make_install ln -s gtk-lshw %{buildroot}/%{_sbindir}/lshw-gui rm -rf %{buildroot}/%{_datadir}/locale/fr/ -%check -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml -cd build -src/lshw -json -disable usb -disable pcmcia -disable isapnp \ - -disable ide -disable scsi -disable dmi -disable memory \ - -disable cpuinfo 2>/dev/null | %{__python3} -m json.tool - %files %license COPYING -%{_bindir}/lshw-gui %{_sbindir}/*lshw* -%{_datadir}/lshw/artwork -%{_datadir}/lshw/ui/* -%{_datadir}/pixmaps/* -%{_datadir}/applications/gtk-lshw.desktop -%{_datadir}/appdata/gtk-lshw.appdata.xml -%{_datadir}/polkit-1/actions/org.ezix.lshw.gui.policy %files help %doc README.md %{_mandir}/man1/lshw.1.gz +/usr/share/lshw/* %changelog +* Mon Jan 13 2020 chengquan - B.02.18-20 +- remove gui function and unrelated patches + * Mon Sep 9 2019 luhuaxin - B.02.18-19 - Package init