- updated to 1.7.0

- updated make patch
- adjusted for {pci,usb}.ids in hwdata

diff --git a/lsvpd-make.patch b/lsvpd-make.patch
index 583d19d5ab2c15a8db556118469434ffcdb593ef..a807ba8c2f292c41f833005b1b8eb9788e8032dc 100644 (file)
--- a/lsvpd-make.patch
+++ b/lsvpd-make.patch
@@ -1,14 +1,5 @@
 --- lsvpd-1.6.11/Makefile.am.orig      2011-06-16 00:59:59.000000000 +0200
 +++ lsvpd-1.6.11/Makefile.am   2011-09-23 19:29:44.906120445 +0200
-@@ -40,7 +40,7 @@
- lsmcode_SOURCES = src/output/lsmcode.cpp \
-               $(update_h_files)
- 
--vpdupdate_LDADD = -lz -lstdc++ -lvpd_cxx -lsgutils
-+vpdupdate_LDADD = -lz -lstdc++ -lvpd_cxx -lsgutils2
- vpdupdate_LDFLAGS = -Wall
- lsvpd_LDADD = -lz -lstdc++ -lvpd_cxx
- lsvpd_LDFLAGS = -Wall
 @@ -53,25 +53,9 @@
  
  AM_CXXFLAGS = -DDEST_DIR='"${exec_prefix}"' -DVPD_VERSION='"@VERSION@"'
@@ -32,9 +23,9 @@
 -AM_CXXFLAGS += -DUSB_IDS='"/usr/share/misc/usb.ids"'
 -endif
 -endif
-+AM_CXXFLAGS += -DPCI_IDS='"/etc/pci.ids"'
++AM_CXXFLAGS += -DPCI_IDS='"/lib/hwdata/pci.ids"'
 +
-+AM_CXXFLAGS += -DUSB_IDS='"/etc/usb.ids"'
++AM_CXXFLAGS += -DUSB_IDS='"/lib/hwdata/usb.ids"'
  
  SUBDIRS = docs
  

diff --git a/lsvpd.spec b/lsvpd.spec
index 8880114c3ba3cb77bf3cbbab5fad241762a07632..f627027301cfd39594345db1b5929d53187b8ffc 100644 (file)
--- a/lsvpd.spec
+++ b/lsvpd.spec
@@ -8,12 +8,12 @@
 Summary:       VPD/hardware inventory utilities for Linux
 Summary(pl.UTF-8):     Narzędzia do inwentaryzacji VPD/sprzętu dla Linuksa
 Name:          lsvpd
-Version:       1.6.11
+Version:       1.7.0
 Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-# Source0-md5: 6d63c45af3efbac6fbc5dd01648d0f7f
+# Source0-md5: f412a63741dc29e6a23999793237b524
 Source1:       vpdupdater.init
 Source2:       vpdupdater.sysconfig
 Patch0:                %{name}-make.patch
@@ -24,13 +24,15 @@ BuildRequires:      automake
 %{?with_rtas:BuildRequires:    librtas-devel}
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:2.0
+BuildRequires: libvpd-devel >= 2
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sg3_utils-devel
 BuildRequires: zlib-devel
 Requires(post,preun):  /sbin/chkconfig
 Requires(post):        /sbin/ldconfig
-Requires:      /etc/pci.ids
-Requires:      /etc/usb.ids
+Requires:      /lib/hwdata/pci.ids
+Requires:      /lib/hwdata/usb.ids
+Requires:      hwdata >= 0.243-5
 Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -96,6 +98,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README TODO docs/*.html
+%attr(755,root,root) %{_sbindir}/invscout
 %attr(755,root,root) %{_sbindir}/lscfg
 %attr(755,root,root) %{_sbindir}/lsmcode
 %attr(755,root,root) %{_sbindir}/lsvio