rpms/lshw/devel lshw.spec,1.12,1.13

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/lshw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21705

Modified Files:
	lshw.spec 
Log Message:
* Wed May 06 2009 Adam Jackson <ajax at 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.



Index: lshw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lshw/devel/lshw.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- lshw.spec	1 Mar 2009 09:52:43 -0000	1.12
+++ lshw.spec	6 May 2009 17:51:47 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:   Hardware lister
 Name:      lshw
 Version:   B.02.14
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2
 Group:     Applications/System
 URL:       http://ezix.org/project/wiki/HardwareLiSter
@@ -11,6 +11,8 @@ Source2:   lshw.consolehelper
 Source3:   lshw.pam
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires:  hwdata
+
 %description
 lshw is a small tool to provide detailed informaton on the hardware
 configuration of the machine. It can report exact memory configuration,
@@ -24,6 +26,7 @@ Information can be output in plain text,
 Summary:  Graphical hardware lister
 Group:    Applications/System
 Requires: usermode
+Requires: hwdata
 Requires: %{name} = %{version}-%{release}
 BuildRequires: gtk2-devel >= 2.4
 BuildRequires: desktop-file-utils
@@ -66,6 +69,14 @@ pushd src
 
 %{__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
 %{__install} -D -m 0644 -p ./src/gui/artwork/logo.svg \
      %{buildroot}%{_datadir}/pixmaps/%{name}-logo.svg
@@ -89,9 +100,6 @@ desktop-file-install --vendor fedora  \
 %doc COPYING README docs/*
 %doc %{_mandir}/man1/lshw.1*
 %{_sbindir}/%{name}
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*.txt
-%{_datadir}/%{name}/*.ids
 
 %files gui
 %defattr(-, root, root, -)
@@ -106,6 +114,11 @@ desktop-file-install --vendor fedora  \
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed May 06 2009 Adam Jackson <ajax at 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 at phys.ntnu.no> - B.02.14-1
 - B.02.14
 - Drop gcc43 patch now upstream