- does not build with C++17 standard, downgrade, rel 4

[packages/lsvpd.git] / lsvpd.spec

diff --git a/lsvpd.spec b/lsvpd.spec
index 975985800b5af1e7c533cc30a864ed5784c628d7..66692464902923630a239247bf12c0040631a0e6 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.7.7
-Release:       1
+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: e7778ed03113013ea6d7f7904fc400d5
+# Source0-md5: 11c59a64c8c2d9ed691f900af32f3879
 Source1:       vpdupdater.init
 Source2:       vpdupdater.sysconfig
 # from libvpd sources
@@ -25,7 +25,7 @@ BuildRequires:        automake
 %{?with_rtas:BuildRequires:    librtas-devel}
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:2.0
-BuildRequires: libvpd-cxx-devel >= 2
+BuildRequires: libvpd-cxx-devel >= 2.2.6
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sg3_utils-devel
 BuildRequires: sqlite3-devel >= 3
@@ -67,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}
@@ -82,7 +83,6 @@ 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
@@ -110,13 +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
-# 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*