X-Git-Url: http://git.pld-linux.org/?p=packages%2Flsvpd.git;a=blobdiff_plain;f=lsvpd.spec;h=66692464902923630a239247bf12c0040631a0e6;hp=f627027301cfd39594345db1b5929d53187b8ffc;hb=c874c7a;hpb=4cdb445c7d564913e0f13f26640b70426f532905

diff --git a/lsvpd.spec b/lsvpd.spec
index f627027..6669246 100644
--- a/lsvpd.spec
+++ b/lsvpd.spec
@@ -8,25 +8,27 @@
 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
-Release:	1
-License:	GPL v2+
+Version:	1.7.10
+Release:	4
+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:	11c59a64c8c2d9ed691f900af32f3879
 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
 BuildRequires:	libtool >= 2:2.0
-BuildRequires:	libvpd-devel >= 2
+BuildRequires:	libvpd-cxx-devel >= 2.2.6
 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}
@@ -66,6 +67,7 @@ wypisuje poziomy mikrokodu i firmware'u.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+export CXXFLAGS="%{rpmcxxflags} -std=c++11"
 %configure \
 	%{!?with_rtas:ac_cv_lib_rtas_rtas_get_vpd=no}
 %{__make}
@@ -78,6 +80,9 @@ 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
 
 %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
@@ -106,9 +110,12 @@ fi
 %attr(755,root,root) %{_sbindir}/vpdupdate
 %dir %{_sysconfdir}/lsvpd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lsvpd/cpu_mod_conv.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lsvpd/nvme_templates.conf
 %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
 %{_mandir}/man8/lscfg.8*
 %{_mandir}/man8/lsmcode.8*
 %{_mandir}/man8/lsvio.8*