- real gcc4 fixes.

[packages/lsvpd.git] / lsvpd.spec

diff --git a/lsvpd.spec b/lsvpd.spec
index fded40e86a9066775a1990cabad314ced3381d71..6d3e2779ee8d973ca879a9714fb718de1fe2d21c 100644 (file)
--- a/lsvpd.spec
+++ b/lsvpd.spec
@@ -1,18 +1,24 @@
 Summary:       VPD/hardware inventory utilities for Linux
 Summary(pl):   Narzêdzia do inwentaryzacji VPD/sprzêtu dla Linuksa
 Name:          lsvpd
-Version:       0.12.0
+Version:       0.16.0
 Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-# Source0-md5: 9263e68bda986f22dbdc11f18b7812b4
-PreReq:                rc-scripts
+# Source0-md5: d3abbecb7056816fe3f6ce6729b433cc
+Patch0:                %{name}-gcc4.patch
+URL:           http://linux-diag.sourceforge.net/Lsvpd.html
+BuildRequires: perl-base
+BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: sed >= 4.0
+BuildRequires: sg3_utils-devel >= 1.01
 Requires(post,preun):  /sbin/chkconfig
 Requires:      /bin/bash
 Requires:      /bin/sed
 Requires:      /bin/sh
-#Requires:     sg3_utils >= 1.01
+Requires:      rc-scripts
+Requires:      sg3_utils >= 1.01
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,15 +42,14 @@ wypisuje poziomy mikrokodu i firmware'u.
 
 %prep
 %setup -q
+%patch0 -p1
+sed -i -e "s,#!/bin/sh,#!/bin/bash," scripts/lsvpd.in
 
 %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 -Werror -I../lib" \
+       LDLIBS="-lsgutils"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,18 +60,23 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install debian/init.d $RPM_BUILD_ROOT/etc/rc.d/init.d/lsvpd
 # don't install this right now.  It can crash systems.
-rm -f $RPM_BUILD_ROOT/lib/lsvpd/pci_vpd_rom_grab
+#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 debian/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
+%service lsvpd restart
 
 %preun
 if [ "$1" = "0" ] ; then
+       %service lsvpd stop
        /sbin/chkconfig --del lsvpd
 fi
 
@@ -76,27 +86,26 @@ 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/query.d
 /lib/lsvpd/scan.d
-/lib/lsvpd/scsihost.conf
 /lib/lsvpd/scsivpd.conf
+%attr(755,root,root) /lib/lsvpd/adapter_pci_legacy
 %attr(755,root,root) /lib/lsvpd/ibm_vpd_render
-%attr(755,root,root) /lib/lsvpd/lsvpd_test
-%attr(755,root,root) /lib/lsvpd/pci_lookup
-%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/node_handler
 %attr(755,root,root) /lib/lsvpd/tdump
-%attr(755,root,root) /lib/lsvpd/tidy_lsvpd_dbs
-%attr(755,root,root) /lib/lsvpd/tidy_subdirs
 %attr(754,root,root) /etc/rc.d/init.d/lsvpd
 %attr(755,root,root) /etc/cron.daily/lsvpd
 %{_mandir}/man8/*