X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=lsvpd.spec;h=66692464902923630a239247bf12c0040631a0e6;hb=refs%2Ftags%2Fauto%2Fth%2Flsvpd-1.7.10-4;hp=c407793d1d92d6ae8e933880635c5637e403446d;hpb=a56e912e586773dec5225881c103cda18143547b;p=packages%2Flsvpd.git

diff --git a/lsvpd.spec b/lsvpd.spec
index c407793..6669246 100644
--- a/lsvpd.spec
+++ b/lsvpd.spec
@@ -1,31 +1,43 @@
+#
+# Conditional build:
+%bcond_with	rtas	# RTAS support (PowerPC)
+#
+%ifarch ppc ppc64
+%define	with_rtas	1
+%endif
 Summary:	VPD/hardware inventory utilities for Linux
 Summary(pl.UTF-8):	Narzędzia do inwentaryzacji VPD/sprzętu dla Linuksa
 Name:		lsvpd
-Version:	1.0.3
-Release:	3
-License:	GPL
+Version:	1.7.10
+Release:	4
+License:	GPL v2+ with librtas exception
 Group:		Applications/System
-Source0:	http://dl.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-# Source0-md5:	5d6cc395deeab1bb926a2f973d4cad1d
-Patch0:		%{name}-make.patch
+Source0:	http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
+# Source0-md5:	11c59a64c8c2d9ed691f900af32f3879
+Source1:	vpdupdater.init
+Source2:	vpdupdater.sysconfig
+# 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
-BuildRequires:	db-cxx-devel >= 4.2
+%{?with_rtas:BuildRequires:	librtas-devel}
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.0
+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
+Requires:	/lib/hwdata/pci.ids
+Requires:	/lib/hwdata/usb.ids
+Requires:	hwdata >= 0.243-5
 Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_exec_prefix	/
-%define		_libdir		/usr/%{_lib}
-%define		_sbindir	/sbin
-
 %description
 The lsvpd package contains both the lsvpd, lscfg and lsmcode commands.
 These commands, along with a boot-time scanning script called
@@ -45,30 +57,6 @@ poziomu. Polecenie lscfg dostarcza bardziej czytelną dla człowieka
 postać VPD oraz trochę informacji specyficznych dla systemu. lsmcode
 wypisuje poziomy mikrokodu i firmware'u.
 
-%package devel
-Summary:	Header files for vpd library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki vpd
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description devel
-Header files for vpd library.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki vpd.
-
-%package static
-Summary:	Static vpd library
-Summary(pl.UTF-8):	Statyczna biblioteka vpd
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static vpd library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka vpd.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -79,8 +67,10 @@ Statyczna biblioteka vpd.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
-%{__make} LIBDB=-ldb_cxx-4.6
+export CXXFLAGS="%{rpmcxxflags} -std=c++11"
+%configure \
+	%{!?with_rtas:ac_cv_lib_rtas_rtas_get_vpd=no}
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -88,18 +78,16 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install vpdupdater $RPM_BUILD_ROOT/etc/rc.d/init.d/vpdupdater
+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/%{_lib}
-mv -f $RPM_BUILD_ROOT%{_libdir}/libvpd-1.0.so.*.*.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo libvpd-1.0.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libvpd-1.0.so
+install -d $RPM_BUILD_ROOT/var/lib/lsvpd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add vpdupdater
 
 %postun	-p /sbin/ldconfig
@@ -114,26 +102,22 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README TODO docs/*.html
-%attr(755,root,root) /sbin/lscfg
-%attr(755,root,root) /sbin/lsmcode
-%attr(755,root,root) /sbin/lsvio
-%attr(755,root,root) /sbin/lsvpd
-%attr(755,root,root) /sbin/vpdupdate
-%attr(755,root,root) /%{_lib}/libvpd-1.0.so.*.*.*
+%doc AUTHORS COPYING ChangeLog NEWS README
+%attr(755,root,root) %{_sbindir}/lscfg
+%attr(755,root,root) %{_sbindir}/lsmcode
+%attr(755,root,root) %{_sbindir}/lsvio
+%attr(755,root,root) %{_sbindir}/lsvpd
+%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*
 %{_mandir}/man8/lsvpd.8*
 %{_mandir}/man8/vpdupdate.8*
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvpd-1.0.so
-%{_libdir}/libvpd-1.0.la
-%{_includedir}/libvpd-1
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libvpd-1.0.a