Hello community,
here is the log from the commit of package lsvpd
checked in at Sat Nov 10 00:17:14 CET 2007.
--------
--- lsvpd/lsvpd.changes 2007-11-02 11:59:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/lsvpd/lsvpd.changes 2007-11-09 14:39:39.573699000 +0100
@@ -1,0 +2,11 @@
+Tue Nov 6 09:59:21 CET 2007 - sassmann@suse.de
+
+- update lsvpd (version 1.3.5 - fate #302692)
+- added lsvpd.db43-Makefile-fix.patch
+ fixes Makefile errors concerning Berkeley DB
+- merged lsvpd.db_cxx.patch
+ in lsvpd.db43-Makefile-fix.patch
+- rebased lsvpd.runlevel-script.patch to version 1.3.5
+- rebased lsvpd.cxx-includes.patch to version 1.3.5
+
+-------------------------------------------------------------------
Old:
----
lsvpd-1.3.3.tar.bz2
lsvpd.db_cxx.patch
New:
----
lsvpd-1.3.5.tar.bz2
lsvpd.db43-Makefile-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lsvpd.spec ++++++
--- /var/tmp/diff_new_pack.x26490/_old 2007-11-10 00:13:33.000000000 +0100
+++ /var/tmp/diff_new_pack.x26490/_new 2007-11-10 00:13:33.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package lsvpd (Version 1.3.3)
+# spec file for package lsvpd (Version 1.3.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,21 +11,21 @@
# norootforbuild
Name: lsvpd
-BuildRequires: db43-devel gcc-c++ pciutils scsi usbutils zlib-devel
+BuildRequires: db43-devel gcc-c++ libdb-4_5 libvpd_cxx1-devel pciutils scsi usbutils zlib-devel
Url: http://sourceforge.net/projects/linux-diag/
Summary: VPD Hardware Inventory Utilities for Linux
-Version: 1.3.3
-Release: 11
+Version: 1.3.5
+Release: 1
License: GPL v2 or later
Group: System/Monitoring
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq
Requires: /bin/sed
-Source0: http://cesnet.dl.sourceforge.net/sourceforge/linux-diag/lsvpd-%{version}.tar.bz2
-Patch1: lsvpd.db_cxx.patch
-Patch2: lsvpd.runlevel-script.patch
+Source0: %{name}-%{version}.tar.bz2
+Patch0: lsvpd.runlevel-script.patch
+Patch1: lsvpd.sgutils_dep.patch
+Patch2: lsvpd.db43-Makefile-fix.patch
Patch3: lsvpd.cxx-includes.patch
-Patch4: lsvpd.sgutils_dep.patch
%description
The lsvpd package contains both the lsvpd, lscfg and lsmcode commands.
@@ -45,10 +45,10 @@
%prep
%setup -q
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
autoreconf -fi
@@ -84,6 +84,9 @@
%run_ldconfig
%{insserv_cleanup}
+%preun
+%stop_on_removal
+
%files
%defattr(-,root,root)
%doc README COPYING NEWS
@@ -95,10 +98,16 @@
%attr (644,root,root) %config /etc/udev/rules.d/99-lsvpd.rules
/sbin/*
%attr (755,root,root) /usr/sbin/*
-/usr/include/libvpd-1
-%{_libdir}/lib*
%{_mandir}/*/*
%changelog
+* Tue Nov 06 2007 - sassmann@suse.de
+- update lsvpd (version 1.3.5 - fate #302692)
+- added lsvpd.db43-Makefile-fix.patch
+ fixes Makefile errors concerning Berkeley DB
+- merged lsvpd.db_cxx.patch
+ in lsvpd.db43-Makefile-fix.patch
+- rebased lsvpd.runlevel-script.patch to version 1.3.5
+- rebased lsvpd.cxx-includes.patch to version 1.3.5
* Fri Nov 02 2007 - olh@suse.de
- run vpdupdate during update to reinitialize db (308679)
* Tue Oct 09 2007 - olh@suse.de
++++++ lsvpd-1.3.3.tar.bz2 -> lsvpd-1.3.5.tar.bz2 ++++++
++++ 35033 lines of diff (skipped)
++++++ lsvpd.cxx-includes.patch ++++++
--- /var/tmp/diff_new_pack.x26490/_old 2007-11-10 00:13:34.000000000 +0100
+++ /var/tmp/diff_new_pack.x26490/_new 2007-11-10 00:13:34.000000000 +0100
@@ -1,30 +1,21 @@
----
- src/common/helper_functions.cpp | 1 +
- src/common/lsvpd_error_handler.cpp | 4 ++--
- src/internal/sys_interface/devicetreecollector.cpp | 1 +
- src/internal/sys_interface/fswalk.cpp | 1 +
- src/internal/sys_interface/icollector.cpp | 2 ++
- src/internal/sys_interface/sysfs_SCSI_Fill.cpp | 1 +
- src/internal/sys_interface/sysfstreecollector.cpp | 1 +
- src/internal/updater.cpp | 2 ++
- src/output/lscfg.cpp | 2 +-
- src/output/lsmcode.cpp | 2 +-
- src/output/lsvio.cpp | 2 +-
- src/output/lsvpd.cpp | 2 +-
- 12 files changed, 15 insertions(+), 6 deletions(-)
---- a/src/common/helper_functions.cpp
-+++ b/src/common/helper_functions.cpp
-@@ -21,6 +21,7 @@
+Index: lsvpd-1.3.5/src/internal/sys_interface/devicetreecollector.cpp
+===================================================================
+--- lsvpd-1.3.5.orig/src/internal/sys_interface/devicetreecollector.cpp
++++ lsvpd-1.3.5/src/internal/sys_interface/devicetreecollector.cpp
+@@ -21,6 +21,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-+#include <cstring>
- #include
-
- using namespace std;
---- a/src/common/lsvpd_error_handler.cpp
-+++ b/src/common/lsvpd_error_handler.cpp
++#include <cstdlib>
++
+ #ifdef TRACE_ON
+ #include
+ #endif
+Index: lsvpd-1.3.5/src/common/lsvpd_error_handler.cpp
+===================================================================
+--- lsvpd-1.3.5.orig/src/common/lsvpd_error_handler.cpp
++++ lsvpd-1.3.5/src/common/lsvpd_error_handler.cpp
@@ -22,8 +22,8 @@
***************************************************************************/
@@ -36,103 +27,107 @@
#include
using namespace std;
---- a/src/internal/sys_interface/devicetreecollector.cpp
-+++ b/src/internal/sys_interface/devicetreecollector.cpp
-@@ -41,6 +41,7 @@
- #include
- #include
- #include <sstream>
-+#include <cstdlib>
+Index: lsvpd-1.3.5/src/internal/sys_interface/fswalk.cpp
+===================================================================
+--- lsvpd-1.3.5.orig/src/internal/sys_interface/fswalk.cpp
++++ lsvpd-1.3.5/src/internal/sys_interface/fswalk.cpp
+@@ -21,6 +21,8 @@
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
- #ifdef HAVE_LIBRTAS
- #include
---- a/src/internal/sys_interface/fswalk.cpp
-+++ b/src/internal/sys_interface/fswalk.cpp
-@@ -31,6 +31,7 @@
- #include
- #include
- #include
+#include <cstring>
++
+ #include
+ #include
+ #include
+Index: lsvpd-1.3.5/src/internal/sys_interface/sysfstreecollector.cpp
+===================================================================
+--- lsvpd-1.3.5.orig/src/internal/sys_interface/sysfstreecollector.cpp
++++ lsvpd-1.3.5/src/internal/sys_interface/sysfstreecollector.cpp
+@@ -21,6 +21,8 @@
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ *********************L******************************************************/
- #define TMP_FILE "/tmp/dir_list.tmp"
- #define STRIT(x) #x
---- a/src/internal/sys_interface/icollector.cpp
-+++ b/src/internal/sys_interface/icollector.cpp
-@@ -28,6 +28,8 @@
- #include
- #include <sstream>
- #include <fstream>
+#include <cstring>
-+#include <cstdlib>
- #include
++
+ #ifdef TRACE_ON
+ #include
+ #endif
+@@ -28,7 +30,7 @@
+ #include
+ #endif
- using namespace std;
---- a/src/internal/sys_interface/sysfs_SCSI_Fill.cpp
-+++ b/src/internal/sys_interface/sysfs_SCSI_Fill.cpp
-@@ -52,6 +52,7 @@
- #include
+-#define _XOPEN_SOURCE 500 // For pread
++/*#define _XOPEN_SOURCE 500 // For pread*/
- #include <sstream>
-+#include <cstring>
+ #include
+ #include
+Index: lsvpd-1.3.5/src/internal/updater.cpp
+===================================================================
+--- lsvpd-1.3.5.orig/src/internal/updater.cpp
++++ lsvpd-1.3.5/src/internal/updater.cpp
+@@ -22,6 +22,8 @@
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
- extern "C"
- {
---- a/src/internal/sys_interface/sysfstreecollector.cpp
-+++ b/src/internal/sys_interface/sysfstreecollector.cpp
-@@ -55,6 +55,7 @@
- #include <fstream>
- #include <sstream>
- #include <iomanip>
+#include <cstring>
-
- extern int errno;
-
---- a/src/internal/updater.cpp
-+++ b/src/internal/updater.cpp
-@@ -26,6 +26,8 @@
++#include <cstdlib>
+ #include <vector>
#include <string>
#include <iostream>
- #include <sstream>
-+#include <cstdlib>
-+#include <cstring>
-
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE // for getopt_long
---- a/src/output/lscfg.cpp
-+++ b/src/output/lscfg.cpp
-@@ -28,7 +28,7 @@
+Index: lsvpd-1.3.5/src/output/lscfg.cpp
+===================================================================
+--- lsvpd-1.3.5.orig/src/output/lscfg.cpp
++++ lsvpd-1.3.5/src/output/lscfg.cpp
+@@ -26,6 +26,7 @@
+ #include
+ #include
++#include <cstring>
#include <iostream>
#include <iomanip>
--#include <string>
-+#include <cstring>
- #include <vector>
- #include <sstream>
-
---- a/src/output/lsmcode.cpp
-+++ b/src/output/lsmcode.cpp
-@@ -27,7 +27,7 @@
+ #include <string>
+Index: lsvpd-1.3.5/src/output/lsvio.cpp
+===================================================================
+--- lsvpd-1.3.5.orig/src/output/lsvio.cpp
++++ lsvpd-1.3.5/src/output/lsvio.cpp
+@@ -28,6 +28,7 @@
#include
+ #include
- #include <iostream>
--#include <string>
+#include <cstring>
+ #include <iostream>
+ #include <string>
#include <vector>
- #include <sstream>
-
---- a/src/output/lsvio.cpp
-+++ b/src/output/lsvio.cpp
-@@ -29,7 +29,7 @@
- #include
+Index: lsvpd-1.3.5/src/output/lsmcode.cpp
+===================================================================
+--- lsvpd-1.3.5.orig/src/output/lsmcode.cpp
++++ lsvpd-1.3.5/src/output/lsmcode.cpp
+@@ -26,6 +26,7 @@
+ #include
+ #include
- #include <iostream>
--#include <string>
+#include <cstring>
+ #include <iostream>
+ #include <string>
#include <vector>
- #include <sstream>
-
---- a/src/output/lsvpd.cpp
-+++ b/src/output/lsvpd.cpp
+Index: lsvpd-1.3.5/src/internal/sys_interface/sysfs_SCSI_Fill.cpp
+===================================================================
+--- lsvpd-1.3.5.orig/src/internal/sys_interface/sysfs_SCSI_Fill.cpp
++++ lsvpd-1.3.5/src/internal/sys_interface/sysfs_SCSI_Fill.cpp
+@@ -38,6 +38,8 @@
+ *
+ */
+
++#include <cstring>
++
+ #define TRACE_ON
+
+ #ifdef HAVE_CONFIG_H
+Index: lsvpd-1.3.5/src/output/lsvpd.cpp
+===================================================================
+--- lsvpd-1.3.5.orig/src/output/lsvpd.cpp
++++ lsvpd-1.3.5/src/output/lsvpd.cpp
@@ -28,7 +28,7 @@
#include
++++++ lsvpd.db43-Makefile-fix.patch ++++++
Index: lsvpd-1.3.5/Makefile.am
===================================================================
--- lsvpd-1.3.5.orig/Makefile.am
+++ lsvpd-1.3.5/Makefile.am
@@ -40,15 +40,15 @@ lsvio_SOURCES = src/output/lsvio.cpp
lsmcode_SOURCES = src/output/lsmcode.cpp
-vpdupdate_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx -lvpd_cxx -lsgutils
+vpdupdate_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx-4.3 -lvpd_cxx -lsgutils
vpdupdate_LDFLAGS = -Wall
-lsvpd_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx -lvpd_cxx
+lsvpd_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx-4.3 -lvpd_cxx
lsvpd_LDFLAGS = -Wall
-lscfg_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx -lvpd_cxx
+lscfg_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx-4.3 -lvpd_cxx
lscfg_LDFLAGS = -Wall
-lsvio_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx -lvpd_cxx
+lsvio_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx-4.3 -lvpd_cxx
lsvio_LDFLAGS = -Wall
-lsmcode_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx -lvpd_cxx
+lsmcode_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx-4.3 -lvpd_cxx
lsmcode_LDFLAGS = -Wall
AM_CXXFLAGS = -DDEST_DIR='"${exec_prefix}"' -DVPD_VERSION='"@VERSION@"'
++++++ lsvpd.runlevel-script.patch ++++++
--- /var/tmp/diff_new_pack.x26490/_old 2007-11-10 00:13:34.000000000 +0100
+++ /var/tmp/diff_new_pack.x26490/_new 2007-11-10 00:13:34.000000000 +0100
@@ -2,16 +2,18 @@
vpdupdater | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---- a/vpdupdater
-+++ b/vpdupdater
+Index: lsvpd-1.3.5/vpdupdater
+===================================================================
+--- lsvpd-1.3.5.orig/vpdupdater
++++ lsvpd-1.3.5/vpdupdater
@@ -8,11 +8,12 @@
### BEGIN INIT INFO
# Provides: vpdupdater
# Required-Start:
-# X-UnitedLinux-Should-Start:
-+# Should-Start:
++# Should-Start: $remote_fs
# Required-Stop:
--# Default-Start: 2
+-# Default-Start: 3
+# Default-Start: 2 3 5
# Default-Stop: 0 6
-# Description: VPD Database manager
++++++ lsvpd.sgutils_dep.patch ++++++
--- /var/tmp/diff_new_pack.x26490/_old 2007-11-10 00:13:34.000000000 +0100
+++ /var/tmp/diff_new_pack.x26490/_new 2007-11-10 00:13:34.000000000 +0100
@@ -5,14 +5,16 @@
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- lsvpd-1.3.1.orig/Makefile.am
-+++ lsvpd-1.3.1/Makefile.am
-@@ -72,7 +72,7 @@ lsvio_SOURCES = src/output/lsvio.cpp \
- lsmcode_SOURCES = src/output/lsmcode.cpp \
- $(lib_h_files)
+Index: lsvpd-1.3.5/Makefile.am
+===================================================================
+--- lsvpd-1.3.5.orig/Makefile.am
++++ lsvpd-1.3.5/Makefile.am
+@@ -40,7 +40,7 @@ lsvio_SOURCES = src/output/lsvio.cpp
--vpdupdate_LDADD = -L. -lz -lstdc++ /usr/lib/libsgutils.a ./libvpd-1.3.la
-+vpdupdate_LDADD = -L. -lz -lstdc++ -lsgutils ./libvpd-1.3.la
+ lsmcode_SOURCES = src/output/lsmcode.cpp
+
+-vpdupdate_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx -lvpd_cxx /usr/lib/libsgutils.a
++vpdupdate_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx -lvpd_cxx -lsgutils
vpdupdate_LDFLAGS = -Wall
- lsvpd_LDADD = -L. -lz -lstdc++ ./libvpd-1.3.la
+ lsvpd_LDADD = -L. -lz -lstdc++ -lpthread -ldb_cxx -lvpd_cxx
lsvpd_LDFLAGS = -Wall
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org