packages: lsvpd/lsvpd-make.patch, lsvpd/lsvpd.spec, lsvpd/vpdupdater.init (...

Tue May 3 10:28:54 CEST 2011

Author: qboosh                       Date: Tue May  3 08:28:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.6.10
- added PLD init script (previous one no longer present in sources)

---- Files affected:
packages/lsvpd:
   lsvpd-make.patch (1.1 -> 1.2) , lsvpd.spec (1.28 -> 1.29) , vpdupdater.init (NONE -> 1.1)  (NEW), vpdupdater.sysconfig (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/lsvpd/lsvpd-make.patch
diff -u packages/lsvpd/lsvpd-make.patch:1.1 packages/lsvpd/lsvpd-make.patch:1.2

--- packages/lsvpd/lsvpd-make.patch:1.1	Sun Feb 18 13:38:49 2007
+++ packages/lsvpd/lsvpd-make.patch	Tue May  3 10:28:49 2011
@@ -1,55 +1,38 @@
---- lsvpd-1.0.3/Makefile.am.orig	2007-02-13 00:21:51.000000000 +0100
-+++ lsvpd-1.0.3/Makefile.am	2007-02-18 12:55:47.609817984 +0100
-@@ -25,7 +25,7 @@
- 
- lib_LTLIBRARIES = libvpd-1.0.la
- 
--library_includedir=/usr/$(includedir)/libvpd-1/
-+library_includedir=$(includedir)/libvpd-1/
- library_include_HEADERS = $(lib_h_files)
- 
- INCLUDES = -I./src/include
-@@ -70,33 +70,27 @@
- 		
+--- lsvpd-1.6.10/Makefile.am.orig	2010-10-16 01:18:16.000000000 +0200
++++ lsvpd-1.6.10/Makefile.am	2011-05-02 20:46:42.634706026 +0200
+@@ -40,7 +40,7 @@
  lsmcode_SOURCES = src/output/lsmcode.cpp \
- 		$(lib_h_files)
--		
--vpdupdate_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz /usr/lib/libsgutils.a ./libvpd-1.0.la
-+
-+LIBDB=-ldb_cxx-4.5
-+
-+vpdupdate_LDADD = $(LIBDB) -lstdc++ -lz -lsgutils ./libvpd-1.0.la
+ 		$(update_h_files)
+ 
+-vpdupdate_LDADD = -L. -lz -lstdc++ -lvpd_cxx -lsgutils
++vpdupdate_LDADD = -L. -lz -lstdc++ -lvpd_cxx -lsgutils2
  vpdupdate_LDFLAGS = -Wall
--lsvpd_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz ./libvpd-1.0.la
-+lsvpd_LDADD = $(LIBDB) -lstdc++ -lz ./libvpd-1.0.la
+ lsvpd_LDADD = -L. -lz -lstdc++ -lvpd_cxx
  lsvpd_LDFLAGS = -Wall
--lscfg_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz ./libvpd-1.0.la
-+lscfg_LDADD = $(LIBDB) -lstdc++ -lz ./libvpd-1.0.la
- lscfg_LDFLAGS = -Wall
--lsvio_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz ./libvpd-1.0.la
-+lsvio_LDADD = $(LIBDB) -lstdc++ -lz ./libvpd-1.0.la
- lsvio_LDFLAGS = -Wall
--lsmcode_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz ./libvpd-1.0.la
-+lsmcode_LDADD = $(LIBDB) -lstdc++ -lz ./libvpd-1.0.la
- lsmcode_LDFLAGS = -Wall
- 
--libvpd_1_0_la_LDFLAGS = -module
-+libvpd_1_0_la_LIBADD = $(LIBDB)
+@@ -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
 +AM_CXXFLAGS += -DPCI_IDS='"/etc/pci.ids"'
  
 -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
+ 
+ SUBDIRS = docs
  
- if DB_CXX_H4_2
- AM_CXXFLAGS += -DDB_CXX='<db4.2/db_cxx.h>'

================================================================
Index: packages/lsvpd/lsvpd.spec
diff -u packages/lsvpd/lsvpd.spec:1.28 packages/lsvpd/lsvpd.spec:1.29
--- packages/lsvpd/lsvpd.spec:1.28	Sat Jun 28 22:10:49 2008
+++ packages/lsvpd/lsvpd.spec	Tue May  3 10:28:49 2011
@@ -1,20 +1,29 @@
 # $Revision$, $Date$
+#
+# 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:	4
-License:	GPL
+Version:	1.6.10
+Release:	1
+License:	GPL v2+
 Group:		Applications/System
-Source0:	http://dl.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-# Source0-md5:	5d6cc395deeab1bb926a2f973d4cad1d
+Source0:	http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
+# Source0-md5:	36b6378586c9566c18175d7612069e41
+Source1:	vpdupdater.init
+Source2:	vpdupdater.sysconfig
 Patch0:		%{name}-make.patch
 URL:		http://linux-diag.sourceforge.net/Lsvpd.html
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	db-cxx-devel >= 4.2
+%{?with_rtas:BuildRequires:	librtas-devel}
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.0
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sg3_utils-devel
 BuildRequires:	zlib-devel
@@ -23,10 +32,6 @@
 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
@@ -46,30 +51,6 @@
 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
@@ -80,8 +61,9 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
-%{__make} LIBDB=-ldb_cxx-4.6
+%configure \
+	%{!?with_rtas:ac_cv_lib_rtas_rtas_get_vpd=no}
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -89,18 +71,13 @@
 %{__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 $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 -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/vpdupdater
+install -D -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/vpdupdater
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add vpdupdater
 
 %postun	-p /sbin/ldconfig
@@ -115,36 +92,33 @@
 
 %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 NEWS README TODO docs/*.html
+%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/scsi_templates.conf
 %attr(754,root,root) /etc/rc.d/init.d/vpdupdater
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vpdupdater
 %{_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
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2011/05/03 08:28:49  qboosh
+- updated to 1.6.10
+- added PLD init script (previous one no longer present in sources)
+
 Revision 1.28  2008/06/28 20:10:49  arekm
 - release 4
 

================================================================
Index: packages/lsvpd/vpdupdater.init
diff -u /dev/null packages/lsvpd/vpdupdater.init:1.1
--- /dev/null	Tue May  3 10:28:54 2011
+++ packages/lsvpd/vpdupdater.init	Tue May  3 10:28:49 2011
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# vpdupdater	VPD Database updater
+#
+# chkconfig:	345 10 90
+#
+# description:	VPD Database updater
+#
+# processname:	vpdupdate
+#
+# $Id$
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+RUN_VPDUPDATE=yes
+
+# Get service config - may override defaults
+[ -f /etc/sysconfig/vpdupdater ] && . /etc/sysconfig/vpdupdater
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start|restart|try-restart|force-reload)
+	if is_yes "$RUN_VPDUPDATE" ; then
+		/usr/sbin/vpdupdate
+	fi
+	;;
+  stop)
+	;;
+  *)
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload}"
+	exit 3
+esac
+
+exit $RETVAL

================================================================
Index: packages/lsvpd/vpdupdater.sysconfig
diff -u /dev/null packages/lsvpd/vpdupdater.sysconfig:1.1
--- /dev/null	Tue May  3 10:28:54 2011
+++ packages/lsvpd/vpdupdater.sysconfig	Tue May  3 10:28:49 2011
@@ -0,0 +1,2 @@
+# whether to run vpdupdate on boot (default=yes)
+RUN_VPDUPDATE=yes
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lsvpd/lsvpd-make.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lsvpd/lsvpd.spec?r1=1.28&r2=1.29&f=u

