rpms/lshw
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Requires: hwdata

Browse Source 
- Drop redundant copies of pci.ids and friends, since we'll pick up the
    copies in hwdata at runtime.
This commit is contained in:
Adam Jackson 2009-05-06 17:51:47 +00:00
parent 041f2e2855
commit 936b3d684e
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lshw.spec
View File

@ -1,7 +1,7 @@
Summary: Hardware lister Summary: Hardware lister
Name: lshw Name: lshw
Version: B.02.14 Version: B.02.14
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/System Group: Applications/System
URL: http://ezix.org/project/wiki/HardwareLiSter URL: http://ezix.org/project/wiki/HardwareLiSter
@ -11,6 +11,8 @@ Source2: lshw.consolehelper
Source3: lshw.pam Source3: lshw.pam
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: hwdata
%description %description
lshw is a small tool to provide detailed informaton on the hardware lshw is a small tool to provide detailed informaton on the hardware
configuration of the machine. It can report exact memory configuration, configuration of the machine. It can report exact memory configuration,
@ -24,6 +26,7 @@ Information can be output in plain text, XML or HTML.
Summary: Graphical hardware lister Summary: Graphical hardware lister
Group: Applications/System Group: Applications/System
Requires: usermode Requires: usermode
Requires: hwdata
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
BuildRequires: gtk2-devel >= 2.4 BuildRequires: gtk2-devel >= 2.4
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -66,6 +69,14 @@ pushd src
%{__ln_s} -f gtk-lshw %{buildroot}%{_sbindir}/lshw-gui %{__ln_s} -f gtk-lshw %{buildroot}%{_sbindir}/lshw-gui
# don't package these copies, use the ones from hwdata instead
rm -f %{buildroot}%{_datadir}/%{name}/pci.ids
rm -f %{buildroot}%{_datadir}/%{name}/usb.ids
# don't package these copies, they're not actually used by the app,
# and even if they were, should use the hwdata versions
rm -f %{buildroot}%{_datadir}/%{name}/oui.txt
rm -f %{buildroot}%{_datadir}/%{name}/manuf.txt
# desktop icon # desktop icon
%{__install} -D -m 0644 -p ./src/gui/artwork/logo.svg \ %{__install} -D -m 0644 -p ./src/gui/artwork/logo.svg \
%{buildroot}%{_datadir}/pixmaps/%{name}-logo.svg %{buildroot}%{_datadir}/pixmaps/%{name}-logo.svg
@ -89,9 +100,6 @@ desktop-file-install --vendor fedora \
%doc COPYING README docs/* %doc COPYING README docs/*
%doc %{_mandir}/man1/lshw.1* %doc %{_mandir}/man1/lshw.1*
%{_sbindir}/%{name} %{_sbindir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*.txt
%{_datadir}/%{name}/*.ids
%files gui %files gui
%defattr(-, root, root, -) %defattr(-, root, root, -)
@ -106,6 +114,11 @@ desktop-file-install --vendor fedora \
%{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/applications/fedora-%{name}.desktop
%changelog %changelog
* Wed May 06 2009 Adam Jackson <ajax@redhat.com> B.02.14-2
- Requires: hwdata
- Drop redundant copies of pci.ids and friends, since we'll pick up the
copies in hwdata at runtime.
* Sun Mar 1 2009 Terje Rosten <terjeros@phys.ntnu.no> - B.02.14-1 * Sun Mar 1 2009 Terje Rosten <terjeros@phys.ntnu.no> - B.02.14-1
- B.02.14 - B.02.14
- Drop gcc43 patch now upstream - Drop gcc43 patch now upstream