- updated to 1.7.5

- updated nortas patch
- removed obsolete make patch
- added udev-based vpdupdate configuration from libvpd

diff --git a/90-vpdupdate.rules b/90-vpdupdate.rules
new file mode 100644 (file)
index 0000000..d332c3c
--- /dev/null
+++ b/90-vpdupdate.rules
@@ -0,0 +1 @@
+KERNELS=="*", ACTION=="*", DEVPATH=="/devices/*", RUN+="/bin/touch /var/lib/lsvpd/run.vpdupdate"

diff --git a/lsvpd-make.patch b/lsvpd-make.patch
deleted file mode 100644 (file)
index a807ba8..0000000
--- a/lsvpd-make.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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
-@@ -53,25 +53,9 @@
- 
- AM_CXXFLAGS = -DDEST_DIR='"${exec_prefix}"' -DVPD_VERSION='"@VERSION@"'
- 
--if PCI_IDS_LOC
--AM_CXXFLAGS += -DPCI_IDS='"/usr/share/pci.ids"'
--else
--if PCI_IDS_LOC2
--AM_CXXFLAGS += -DPCI_IDS='"/usr/share/hwdata/pci.ids"'
--else
--AM_CXXFLAGS += -DPCI_IDS='"/usr/share/misc/pci.ids"'
--endif
--endif
--
--if USB_IDS_LOC
--AM_CXXFLAGS += -DUSB_IDS='"/usr/share/usb.ids"'
--else
--if USB_IDS_LOC2
--AM_CXXFLAGS += -DUSB_IDS='"/usr/share/hwdata/usb.ids"'
--else
--AM_CXXFLAGS += -DUSB_IDS='"/usr/share/misc/usb.ids"'
--endif
--endif
-+AM_CXXFLAGS += -DPCI_IDS='"/lib/hwdata/pci.ids"'
-+
-+AM_CXXFLAGS += -DUSB_IDS='"/lib/hwdata/usb.ids"'
- 
- SUBDIRS = docs
- 

diff --git a/lsvpd-nortas.patch b/lsvpd-nortas.patch
index 1579d2c129b5a7c3c86f87dc3a43c4971047c8b0..0569ed88ea222a43b93aed564e95ed7b530c2102 100644 (file)
--- a/lsvpd-nortas.patch
+++ b/lsvpd-nortas.patch
@@ -1,13 +1,13 @@
---- lsvpd-1.6.11/configure.in.orig     2011-07-22 10:11:41.000000000 +0200
-+++ lsvpd-1.6.11/configure.in  2011-09-23 19:33:05.106127148 +0200
-@@ -27,9 +27,7 @@
- AC_CHECK_HEADER([sqlite3.h],,[AC_MSG_ERROR([sqlite header files are required for building lsvpd])])
+--- lsvpd-1.7.5/configure.ac.orig      2015-07-02 21:30:28.721114988 +0200
++++ lsvpd-1.7.5/configure.ac   2015-07-02 21:32:09.714444083 +0200
+@@ -33,9 +33,7 @@
+ AC_CHECK_HEADER([libvpd-2/lsvpd.hpp],,[AC_MSG_ERROR([libvpd header files required for building lsvpd])])
  
  #libraries
 -AC_CHECK_LIB(rtas, rtas_get_vpd, [], [
 -                      echo "rtas library is required for lsvpd"
 -                      exit 1 ])
 +AC_CHECK_LIB(rtas, rtas_get_vpd)
- AC_CHECK_LIB(sqlite3, sqlite3_libversion_number, [], [ 
+ AC_CHECK_LIB(sqlite3, sqlite3_libversion_number, [], [
                        echo "sqlite3 library is required for lsvpd"
                        exit 1 ])

diff --git a/lsvpd.spec b/lsvpd.spec
index 94b56abbf27cce95cef04106e42a284894c86701..daad72584945fa7076ad2a16b913d5f22d2abbac 100644 (file)
--- a/lsvpd.spec
+++ b/lsvpd.spec
@@ -8,18 +8,19 @@
 Summary:       VPD/hardware inventory utilities for Linux
 Summary(pl.UTF-8):     Narzędzia do inwentaryzacji VPD/sprzętu dla Linuksa
 Name:          lsvpd
-Version:       1.7.0
+Version:       1.7.5
 Release:       1
-License:       GPL v2+
+License:       GPL v2+ with librtas exception
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-# Source0-md5: f412a63741dc29e6a23999793237b524
+# Source0-md5: c301c1e19987475af816414a066b689f
 Source1:       vpdupdater.init
 Source2:       vpdupdater.sysconfig
-Patch0:                %{name}-make.patch
-Patch1:                %{name}-nortas.patch
+# from libvpd sources
+Source3:       90-vpdupdate.rules
+Patch0:                %{name}-nortas.patch
 URL:           http://linux-diag.sourceforge.net/Lsvpd.html
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake
 %{?with_rtas:BuildRequires:    librtas-devel}
 BuildRequires: libstdc++-devel
@@ -27,6 +28,7 @@ BuildRequires:        libtool >= 2:2.0
 BuildRequires: libvpd-cxx-devel >= 2
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sg3_utils-devel
+BuildRequires: sqlite3-devel >= 3
 BuildRequires: zlib-devel
 Requires(post,preun):  /sbin/chkconfig
 Requires(post):        /sbin/ldconfig
@@ -58,7 +60,6 @@ wypisuje poziomy mikrokodu i firmware'u.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -78,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 
 install -D -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/vpdupdater
 install -D -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/vpdupdater
+install -D -p %{SOURCE3} $RPM_BUILD_ROOT/lib/udev/rules.d/90-vpdupdate.rules
+
+install -d $RPM_BUILD_ROOT/var/lib/lsvpd
+touch $RPM_BUILD_ROOT/var/lib/lsvpd/run.vpdupdate
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,8 +102,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README TODO docs/*.html
-%attr(755,root,root) %{_sbindir}/invscout
+%doc AUTHORS COPYING ChangeLog NEWS README
 %attr(755,root,root) %{_sbindir}/lscfg
 %attr(755,root,root) %{_sbindir}/lsmcode
 %attr(755,root,root) %{_sbindir}/lsvio
@@ -109,6 +113,10 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lsvpd/scsi_templates.conf
 %attr(754,root,root) /etc/rc.d/init.d/vpdupdater
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vpdupdater
+/lib/udev/rules.d/90-vpdupdate.rules
+%dir /var/lib/lsvpd
+# empty control file, only mtime changes and matters
+%verify(not mtime) /var/lib/lsvpd/run.vpdupdate
 %{_mandir}/man8/lscfg.8*
 %{_mandir}/man8/lsmcode.8*
 %{_mandir}/man8/lsvio.8*