Hello community,
here is the log from the commit of package lsvpd
checked in at Sun Aug 5 11:44:01 CEST 2007.
--------
--- lsvpd/lsvpd.changes 2007-07-02 14:35:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/lsvpd/lsvpd.changes 2007-08-04 10:08:43.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Aug 4 10:08:16 CEST 2007 - olh@suse.de
+
+- update to 1.3.1
+ db4.3 changes partly merged
+
+-------------------------------------------------------------------
Old:
----
lsvpd-1.3.0.tar.bz2
New:
----
lsvpd-1.3.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lsvpd.spec ++++++
--- /var/tmp/diff_new_pack.t17410/_old 2007-08-05 11:43:49.000000000 +0200
+++ /var/tmp/diff_new_pack.t17410/_new 2007-08-05 11:43:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package lsvpd (Version 1.3.0)
+# spec file for package lsvpd (Version 1.3.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,7 +14,7 @@
BuildRequires: db43-devel gcc-c++ pciutils scsi usbutils zlib-devel
URL: http://sourceforge.net/projects/linux-diag/
Summary: VPD Hardware Inventory Utilities for Linux
-Version: 1.3.0
+Version: 1.3.1
Release: 1
License: GPL v2 or later
Group: System/Monitoring
@@ -96,6 +96,9 @@
%{_mandir}/*/*
%changelog
+* Sat Aug 04 2007 - olh@suse.de
+- update to 1.3.1
+ db4.3 changes partly merged
* Mon Jul 02 2007 - olh@suse.de
- update to 1.3.0
add udev support
++++++ lsvpd-1.3.0.tar.bz2 -> lsvpd-1.3.1.tar.bz2 ++++++
++++ 4839 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lsvpd-1.3.0/configure.in new/lsvpd-1.3.1/configure.in
--- old/lsvpd-1.3.0/configure.in 2007-06-28 00:49:43.000000000 +0200
+++ new/lsvpd-1.3.1/configure.in 2007-08-04 00:50:12.000000000 +0200
@@ -1,5 +1,5 @@
#base
-AC_INIT([lsvpd],[1.3.0],[ebmunson@us.ibm.com,bpeters@us.ibm.com])
+AC_INIT([lsvpd],[1.3.1],[ebmunson@us.ibm.com,bpeters@us.ibm.com])
AC_CONFIG_HEADER(src/include/libvpd-1/config.h)
AM_INIT_AUTOMAKE
AC_SUBST(DATE, [`date`])
@@ -40,8 +40,8 @@
#db_cxx.h location conditional.
AM_CONDITIONAL(DB_CXX_H, [test -e /usr/include/db_cxx.h])
-AM_CONDITIONAL(DB_CXX_H42, [test -e /usr/include/db42/db_cxx.h])
-AM_CONDITIONAL(DB_CXX_H4_2, [test -e /usr/include/db4.2/db_cxx.h])
+AM_CONDITIONAL(DB_CXX_H43, [test -e /usr/include/db43/db_cxx.h])
+AM_CONDITIONAL(DB_CXX_H4_3, [test -e /usr/include/db4.3/db_cxx.h])
#finished
AC_CONFIG_FILES([Makefile lsvpd.spec debian/changelog])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lsvpd-1.3.0/debian/changelog.in new/lsvpd-1.3.1/debian/changelog.in
--- old/lsvpd-1.3.0/debian/changelog.in 2007-01-24 23:48:25.000000000 +0100
+++ new/lsvpd-1.3.1/debian/changelog.in 2007-08-04 01:18:45.000000000 +0200
@@ -2,5 +2,5 @@
* See NEWS.
- -- Eric Munson @DATE@
- -- Brad Peters @DATE@
+ -- Eric Munson Fri, 03 Aug 2007 16:17:31 -0800
+ -- Brad Peters Fri, 03 Aug 2007 16:17:31 -0800
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lsvpd-1.3.0/lsvpd.spec.in new/lsvpd-1.3.1/lsvpd.spec.in
--- old/lsvpd-1.3.0/lsvpd.spec.in 2007-06-28 00:50:37.000000000 +0200
+++ new/lsvpd-1.3.1/lsvpd.spec.in 2007-07-16 19:44:18.000000000 +0200
@@ -10,8 +10,8 @@
Group: System Environment
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-buildroot/
-Provides: libvpd-1.2
-Requires: udev chkconfig
+Provides: libvpd-%{version}
+Requires: udev /sbin/chkconfig libvpd-%{version}
%description
The lsvpd package contains both the lsvpd, lscfg and lsmcode
@@ -27,49 +27,48 @@
%setup -q
%build
-sh configure --prefix=/usr/
-make CC=%__cc
+/bin/sh configure --prefix=%{_prefix}/
+/usr/bin/make CC=%__cc
%clean
-rm -rf $RPM_BUILD_ROOT
+/bin/rm -rf $RPM_BUILD_ROOT
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-strip ${RPM_BUILD_ROOT}/usr/sbin/vpdupdate
-strip ${RPM_BUILD_ROOT}/usr/sbin/lsvpd
-strip ${RPM_BUILD_ROOT}/usr/sbin/lscfg
-strip ${RPM_BUILD_ROOT}/usr/sbin/lsvio
-strip ${RPM_BUILD_ROOT}/usr/sbin/lsmcode
+/bin/rm -rf $RPM_BUILD_ROOT
+/usr/bin/make install DESTDIR=$RPM_BUILD_ROOT
+/usr/bin/strip ${RPM_BUILD_ROOT}%{_sbindir}/vpdupdate
+/usr/bin/strip ${RPM_BUILD_ROOT}%{_sbindir}/lsvpd
+/usr/bin/strip ${RPM_BUILD_ROOT}%{_sbindir}/lscfg
+/usr/bin/strip ${RPM_BUILD_ROOT}%{_sbindir}/lsvio
+/usr/bin/strip ${RPM_BUILD_ROOT}%{_sbindir}/lsmcode
%post
if [ ! -e /usr/share/pci.ids ]; then
- ln -s /usr/share/hwdata/pci.ids /usr/share/pci.ids
+ /bin/ln -s /usr/share/hwdata/pci.ids /usr/share/pci.ids
fi
if [ ! -e /usr/share/usb.ids ]; then
- ln -s /usr/share/hwdata/usb.ids /usr/share/usb.ids
+ /bin/ln -s /usr/share/hwdata/usb.ids /usr/share/usb.ids
fi
-ldconfig
-PATH="${PATH}:/usr/sbin"
-vpdupdate
+/sbin/ldconfig
+/usr/sbin/vpdupdate
-chkconfig vpdupdater
+/sbin/chkconfig --add vpdupdater
%preun
-%postun
+%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc COPYING INSTALL NEWS README TODO
-/usr/sbin/lsvpd
-/usr/sbin/lscfg
-/usr/sbin/lsmcode
-/usr/sbin/lsvio
-/usr/sbin/vpdupdate
-/usr/include/libvpd-1
+%{_sbindir}/lsvpd
+%{_sbindir}/lscfg
+%{_sbindir}/lsmcode
+%{_sbindir}/lsvio
+%{_sbindir}/vpdupdate
+%{_includedir}/libvpd-1
/usr/lib
/etc/init.d/vpdupdater
/etc/udev/rules.d/99-lsvpd.rules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lsvpd-1.3.0/Makefile.am new/lsvpd-1.3.1/Makefile.am
--- old/lsvpd-1.3.0/Makefile.am 2007-06-28 00:50:20.000000000 +0200
+++ new/lsvpd-1.3.1/Makefile.am 2007-08-04 00:50:12.000000000 +0200
@@ -83,7 +83,7 @@
lsmcode_LDADD = -L. -lz -lstdc++ ./libvpd-1.3.la
lsmcode_LDFLAGS = -Wall
-libvpd_1_3_la_LDFLAGS = /usr/lib/libdb_cxx.a -module -lstdc++ -lpthread
+libvpd_1_3_la_LDFLAGS = /usr/lib/libdb_cxx-4.3.a -module -lstdc++ -lpthread
AM_CXXFLAGS = -DDEST_DIR='"${exec_prefix}"' -DVPD_VERSION='"@VERSION@"'
@@ -99,14 +99,14 @@
AM_CXXFLAGS += -DUSB_IDS='"/usr/share/misc/usb.ids"'
endif
-if DB_CXX_H
-AM_CXXFLAGS += -DDB_CXX=''
+if DB_CXX_H4_3
+AM_CXXFLAGS += -DDB_CXX=''
else
-if DB_CXX_H42
-AM_CXXFLAGS += -DDB_CXX=''
+if DB_CXX_H43
+AM_CXXFLAGS += -DDB_CXX=''
else
-if DB_CXX_H4_2
-AM_CXXFLAGS += -DDB_CXX=''
+if DB_CXX_H
+AM_CXXFLAGS += -DDB_CXX=''
endif
endif
endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lsvpd-1.3.0/missing new/lsvpd-1.3.1/missing
--- old/lsvpd-1.3.0/missing 2007-02-13 09:13:39.000000000 +0100
+++ new/lsvpd-1.3.1/missing 2006-11-27 03:51:30.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lsvpd-1.3.0/src/include/libvpd-1/config.h new/lsvpd-1.3.1/src/include/libvpd-1/config.h
--- old/lsvpd-1.3.0/src/include/libvpd-1/config.h 2007-06-28 00:53:38.000000000 +0200
+++ new/lsvpd-1.3.1/src/include/libvpd-1/config.h 2007-08-04 00:51:52.000000000 +0200
@@ -137,19 +137,19 @@
#define PACKAGE_NAME "lsvpd"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "lsvpd 1.3.0"
+#define PACKAGE_STRING "lsvpd 1.3.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "lsvpd"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.3.0"
+#define PACKAGE_VERSION "1.3.1"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.3.0"
+#define VERSION "1.3.1"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
++++++ lsvpd.db_cxx.patch ++++++
--- /var/tmp/diff_new_pack.t17410/_old 2007-08-05 11:43:49.000000000 +0200
+++ /var/tmp/diff_new_pack.t17410/_new 2007-08-05 11:43:49.000000000 +0200
@@ -1,45 +1,15 @@
---
- Makefile.am | 10 +++++-----
- configure.in | 4 ++--
- 2 files changed, 7 insertions(+), 7 deletions(-)
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
---- lsvpd-1.3.0.orig/Makefile.am
-+++ lsvpd-1.3.0/Makefile.am
+--- lsvpd-1.3.1.orig/Makefile.am
++++ lsvpd-1.3.1/Makefile.am
@@ -83,7 +83,7 @@ lsvio_LDFLAGS = -Wall
lsmcode_LDADD = -L. -lz -lstdc++ ./libvpd-1.3.la
lsmcode_LDFLAGS = -Wall
--libvpd_1_3_la_LDFLAGS = /usr/lib/libdb_cxx.a -module -lstdc++ -lpthread
+-libvpd_1_3_la_LDFLAGS = /usr/lib/libdb_cxx-4.3.a -module -lstdc++ -lpthread
+libvpd_1_3_la_LDFLAGS = -ldb_cxx-4.3 -module -lstdc++ -lpthread
AM_CXXFLAGS = -DDEST_DIR='"${exec_prefix}"' -DVPD_VERSION='"@VERSION@"'
-@@ -102,11 +102,11 @@ endif
- if DB_CXX_H
- AM_CXXFLAGS += -DDB_CXX=''
- else
--if DB_CXX_H42
--AM_CXXFLAGS += -DDB_CXX=''
-+if DB_CXX_H43
-+AM_CXXFLAGS += -DDB_CXX=''
- else
--if DB_CXX_H4_2
--AM_CXXFLAGS += -DDB_CXX=''
-+if DB_CXX_H4_3
-+AM_CXXFLAGS += -DDB_CXX=''
- endif
- endif
- endif
---- lsvpd-1.3.0.orig/configure.in
-+++ lsvpd-1.3.0/configure.in
-@@ -40,8 +40,8 @@ AM_CONDITIONAL(USB_IDS_LOC, [test -e /us
-
- #db_cxx.h location conditional.
- AM_CONDITIONAL(DB_CXX_H, [test -e /usr/include/db_cxx.h])
--AM_CONDITIONAL(DB_CXX_H42, [test -e /usr/include/db42/db_cxx.h])
--AM_CONDITIONAL(DB_CXX_H4_2, [test -e /usr/include/db4.2/db_cxx.h])
-+AM_CONDITIONAL(DB_CXX_H43, [test -e /usr/include/db43/db_cxx.h])
-+AM_CONDITIONAL(DB_CXX_H4_3, [test -e /usr/include/db4.3/db_cxx.h])
-
- #finished
- AC_CONFIG_FILES([Makefile lsvpd.spec debian/changelog])
++++++ lsvpd.runlevel-script.patch ++++++
--- /var/tmp/diff_new_pack.t17410/_old 2007-08-05 11:43:49.000000000 +0200
+++ /var/tmp/diff_new_pack.t17410/_new 2007-08-05 11:43:49.000000000 +0200
@@ -2,8 +2,8 @@
vpdupdater | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---- lsvpd-1.3.0.orig/vpdupdater
-+++ lsvpd-1.3.0/vpdupdater
+--- lsvpd-1.3.1.orig/vpdupdater
++++ lsvpd-1.3.1/vpdupdater
@@ -8,11 +8,12 @@
### BEGIN INIT INFO
# Provides: vpdupdater
++++++ lsvpd.sgutils_dep.patch ++++++
--- /var/tmp/diff_new_pack.t17410/_old 2007-08-05 11:43:49.000000000 +0200
+++ /var/tmp/diff_new_pack.t17410/_new 2007-08-05 11:43:49.000000000 +0200
@@ -5,8 +5,8 @@
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- lsvpd-1.3.0.orig/Makefile.am
-+++ lsvpd-1.3.0/Makefile.am
+--- 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)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org