![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package lsvpd checked in at Wed Feb 14 10:35:25 CET 2007. -------- --- lsvpd/lsvpd.changes 2006-12-11 13:44:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/lsvpd/lsvpd.changes 2007-02-13 15:55:40.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 13 15:55:00 CET 2007 - olh@suse.de + +- update to 1.0.3 + complete rewrite in C++ + binaries moved to /usr/sbin + +------------------------------------------------------------------- Old: ---- lsvpd-0.16.0.tar.bz2 lsvpd.PROGS2.patch lsvpd.runlevel-exitcodes.patch lsvpd.runlevel-prereq.patch lsvpd.string-literal.patch lsvpd.types.patch New: ---- lsvpd-1.0.3.tar.bz2 lsvpd.include-path.patch lsvpd.non-void-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsvpd.spec ++++++ --- /var/tmp/diff_new_pack.pL2322/_old 2007-02-14 10:32:59.000000000 +0100 +++ /var/tmp/diff_new_pack.pL2322/_new 2007-02-14 10:32:59.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package lsvpd (Version 0.16.0) +# spec file for package lsvpd (Version 1.0.3) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,22 +11,19 @@ # norootforbuild Name: lsvpd -BuildRequires: glib2-devel scsi +BuildRequires: db42-devel gcc-c++ pciutils scsi usbutils URL: http://sourceforge.net/projects/linux-diag/ Summary: VPD Hardware Inventory Utilities for Linux -Version: 0.16.0 -Release: 23 +Version: 1.0.3 +Release: 1 License: GNU General Public License (GPL) Group: System/Monitoring BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq Requires: /bin/sed, sg_utils Source0: http://cesnet.dl.sourceforge.net/sourceforge/linux-diag/lsvpd-%{version}.tar.bz2 -Patch1: lsvpd.runlevel-exitcodes.patch -Patch2: lsvpd.runlevel-prereq.patch -Patch3: lsvpd.types.patch -Patch4: lsvpd.PROGS2.patch -Patch5: lsvpd.string-literal.patch +Patch2: lsvpd.include-path.patch +Patch3: lsvpd.non-void-function.patch %description The lsvpd package contains both the lsvpd, lscfg and lsmcode commands. @@ -46,44 +43,40 @@ %prep %setup -q -%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build -make CFLAGS="$RPM_OPT_FLAGS -fno-unit-at-a-time -I../lib" +autoreconf -fi +%if 0 +CFLAGS="$RPM_OPT_FLAGS" \ +CXXFLAGS="$RPM_OPT_FLAGS" \ +./configure \ + --prefix=/ \ + --libdir=/%{_lib} +%else +%configure +%endif +make %{?jobs:-j%jobs} %clean -rm -rf $RPM_BUILD_ROOT +#rm -rf $RPM_BUILD_ROOT %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/etc/init.d/ -mkdir -p $RPM_BUILD_ROOT/etc/cron.daily/ -install -m 755 debian/init.d $RPM_BUILD_ROOT/etc/init.d/lsvpd -install -m 755 debian/cron.daily $RPM_BUILD_ROOT/etc/cron.daily/lsvpd -# Don't install this right now. It can crash systems. -rm -f $RPM_BUILD_ROOT/lib/lsvpd/pci_vpd_rom_grab +mkdir $RPM_BUILD_ROOT/sbin +for i in lscfg lsmcode lsvio lsvpd update-lsvpd-db +do + if test -f $RPM_BUILD_ROOT/usr/sbin/$i + then + ln -sfvbn ../usr/sbin/$i $RPM_BUILD_ROOT/sbin/$i + fi +done %ifarch ppc ppc64 %post -# SuSE: -if [ -x sbin/insserv ] ; then - # OK, this should probably be boot.lsvpd, but we're not going to - # do that on Red Hat too :-( - sbin/insserv lsvpd - exit 0 -fi -# Red Hat: -if [ -x /sbin/chkconfig ] ; then - /sbin/chkconfig --add lsvpd -fi -if [ -x /sbin/busybox ] ; then - ln -s /sbin/busybox /lib/lsvpd/find -fi +%{fillup_and_insserv vpdupdater} %endif %postun @@ -91,15 +84,19 @@ %files %defattr(-,root,root) -%doc README INSTALL COPYING NEWS docs/*.html -%attr(755,root,root) %config /etc/cron.daily/lsvpd +%doc README COPYING NEWS +%attr (755,root,root) %config /etc/init.d/vpdupdater /sbin/* -%dir /lib/lsvpd -/lib/lsvpd/* -/etc/init.d/lsvpd +%attr (755,root,root) /usr/sbin/* +/usr/include/libvpd-1 +%{_libdir}/lib* %{_mandir}/*/* %changelog -n lsvpd +* Tue Feb 13 2007 - olh@suse.de +- update to 1.0.3 + complete rewrite in C++ + binaries moved to /usr/sbin * Mon Dec 11 2006 - olh@suse.de - fix incorrect string comparsion in device_scsi.c (#227459) * Sun Nov 19 2006 - olh@suse.de ++++++ lsvpd-0.16.0.tar.bz2 -> lsvpd-1.0.3.tar.bz2 ++++++ ++++ 97104 lines of diff (skipped) ++++++ lsvpd.include-path.patch ++++++ --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: lsvpd-1.0.2/Makefile.am =================================================================== --- lsvpd-1.0.2.orig/Makefile.am +++ lsvpd-1.0.2/Makefile.am @@ -25,7 +25,7 @@ update_h_files = src/include/libvpd-1/de 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 ++++++ lsvpd.non-void-function.patch ++++++ src/common/Source.cpp:42: warning: control reaches end of non-void function src/common/component.cpp:158: warning: control reaches end of non-void function src/internal/sys_interface/sysfs_SCSI_Fill.cpp:764: warning: control reaches end of non-void function src/internal/sys_interface/fswalk.cpp:258: warning: control reaches end of non-void function --- src/common/Source.cpp | 2 +- src/common/component.cpp | 1 + src/include/libvpd-1/sysfstreecollector.h | 2 +- src/internal/sys_interface/fswalk.cpp | 5 ++--- src/internal/sys_interface/sysfs_SCSI_Fill.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) Index: lsvpd-1.0.3/src/common/Source.cpp =================================================================== --- lsvpd-1.0.3.orig/src/common/Source.cpp +++ lsvpd-1.0.3/src/common/Source.cpp @@ -38,7 +38,7 @@ namespace lsvpd os << "Source Type: "<< in.type << endl; os << "Source Lines: " << in.lines << endl; os << "Source Preference Level: " << in.preferenceLevel << endl; - + return os; } } Index: lsvpd-1.0.3/src/common/component.cpp =================================================================== --- lsvpd-1.0.3.orig/src/common/component.cpp +++ lsvpd-1.0.3/src/common/component.cpp @@ -155,6 +155,7 @@ namespace lsvpd Component& Component::operator=( const Component& rhs ) { copyToMe( rhs ); + return *this; } unsigned int Component::getPackedSize( ) Index: lsvpd-1.0.3/src/include/libvpd-1/sysfstreecollector.h =================================================================== --- lsvpd-1.0.3.orig/src/include/libvpd-1/sysfstreecollector.h +++ lsvpd-1.0.3/src/include/libvpd-1/sysfstreecollector.h @@ -120,7 +120,7 @@ namespace lsvpd int subtype, string *subtypeDS); - int process_template(Component *fillMe, string *deviceType, + void process_template(Component *fillMe, string *deviceType, char *data, int dataSize, string *format, int pageCode); Index: lsvpd-1.0.3/src/internal/sys_interface/fswalk.cpp =================================================================== --- lsvpd-1.0.3.orig/src/internal/sys_interface/fswalk.cpp +++ lsvpd-1.0.3/src/internal/sys_interface/fswalk.cpp @@ -251,9 +251,8 @@ using namespace lsvpd; closedir(dir); - - - + + return 0; } Index: lsvpd-1.0.3/src/internal/sys_interface/sysfs_SCSI_Fill.cpp =================================================================== --- lsvpd-1.0.3.orig/src/internal/sys_interface/sysfs_SCSI_Fill.cpp +++ lsvpd-1.0.3/src/internal/sys_interface/sysfs_SCSI_Fill.cpp @@ -691,7 +691,7 @@ namespace lsvpd * @arg : deviceType here is looked up based on subtype into the * device_scsi_types_short[] table. This is different than type! */ - int SysFSTreeCollector::process_template(Component *fillMe, + void SysFSTreeCollector::process_template(Component *fillMe, string *deviceType, char *data, int dataSize, string *format, int pageCode) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de