- updated to 0.13.0, removed outdated ide-proc patch

Changed files:
    lsvpd.spec -> 1.11

diff --git a/lsvpd.spec b/lsvpd.spec
index 4dc562def40d4fb80c1af917b6ae301d54d79f84..d60b9da9ace40ce29c1fa4df70ed614bd57a3388 100644 (file)
--- a/lsvpd.spec
+++ b/lsvpd.spec
@@ -1,22 +1,23 @@
 Summary:       VPD/hardware inventory utilities for Linux
 Summary(pl):   Narzêdzia do inwentaryzacji VPD/sprzêtu dla Linuksa
 Name:          lsvpd
-Version:       0.12.7
+Version:       0.13.0
 Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-# Source0-md5: d5e46f3a92e36a82a07e02fd3244e6d9
-Patch0:                %{name}-ide-proc.patch
+# Source0-md5: 189068fe7e7ce78de9322bbdebb64fd9
 URL:           http://linux-diag.sourceforge.net/Lsvpd.html
 BuildRequires: perl-base
 BuildRequires: sed >= 4.0
+BuildRequires: sg3_utils-devel >= 1.01
+BuildRequires: sysfsutils-devel
 PreReq:                rc-scripts
 Requires(post,preun):  /sbin/chkconfig
 Requires:      /bin/bash
 Requires:      /bin/sed
 Requires:      /bin/sh
-#Requires:     sg3_utils >= 1.01
+Requires:      sg3_utils >= 1.01
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,16 +41,15 @@ wypisuje poziomy mikrokodu i firmware'u.
 
 %prep
 %setup -q
-%patch0 -p1
+
+sed -i -e "s,#!/bin/sh,#!/bin/bash," scripts/lsvpd.in
+sed -i -e 's,sysfs/,,' src/device_sysfs.c src/sysfs.c
 
 %build
-sed -ie "s,#!/bin/sh,#!/bin/bash," lsvpd.in
 %{__make} \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags} -Wall -I../lib"
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+       CFLAGS="%{rpmcflags} -Wall -I../lib" \
+       LDLIBS="-lsysfs -lsgutils"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -63,10 +63,13 @@ install debian/init.d $RPM_BUILD_ROOT/etc/rc.d/init.d/lsvpd
 rm -f $RPM_BUILD_ROOT/lib/lsvpd/pci_vpd_rom_grab
 
 install -d $RPM_BUILD_ROOT/etc/cron.daily
-install lsvpd.cron.daily $RPM_BUILD_ROOT/etc/cron.daily/lsvpd
+install scripts/lsvpd.cron.daily $RPM_BUILD_ROOT/etc/cron.daily/lsvpd
 
 ln -sf /usr/bin/find $RPM_BUILD_ROOT/lib/lsvpd/find
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post
 /sbin/chkconfig --add lsvpd
 
@@ -81,28 +84,30 @@ fi
 %attr(755,root,root) /sbin/lsvpd
 %attr(755,root,root) /sbin/lscfg
 %attr(755,root,root) /sbin/lsmcode
+%attr(755,root,root) /sbin/lsvio
 %attr(755,root,root) /sbin/update-lsvpd-db
 %dir /lib/lsvpd
 /lib/lsvpd/common.d
 /lib/lsvpd/common-post.d
 /lib/lsvpd/debug.bash
+/lib/lsvpd/ide_mf.map
 /lib/lsvpd/lscfg.d
 /lib/lsvpd/lsmcode.d
+/lib/lsvpd/lsvio.d
 /lib/lsvpd/lsvpd-functions.bash
 /lib/lsvpd/lsvpd.d
 /lib/lsvpd/pci.ids
-/lib/lsvpd/pci.vendor.blacklist
 /lib/lsvpd/query.d
 /lib/lsvpd/scan.d
 /lib/lsvpd/scsihost.conf
 /lib/lsvpd/scsivpd.conf
+%attr(755,root,root) /lib/lsvpd/device_handler
 %attr(755,root,root) /lib/lsvpd/ibm_vpd_render
 %attr(755,root,root) /lib/lsvpd/lsvpd_test
 %attr(755,root,root) /lib/lsvpd/pci_ethernet_map
 %attr(755,root,root) /lib/lsvpd/pci_lookup
 %attr(755,root,root) /lib/lsvpd/pci_scsi_map
 %attr(755,root,root) /lib/lsvpd/pci_vpd_cap_grab
-%attr(755,root,root) /lib/lsvpd/scsi_vpd_render
 %attr(755,root,root) /lib/lsvpd/tdump
 %attr(755,root,root) /lib/lsvpd/tidy_lsvpd_dbs
 %attr(755,root,root) /lib/lsvpd/tidy_subdirs