- rebase to latest upstream 1.6.10

.gitignore

@@ -1 +1,2 @@
 lsvpd-1.6.8.tar.gz
+/lsvpd-1.6.10.tar.gz

lsvpd-1.6.10-sg3_utils.patch

@@ -0,0 +1,24 @@
+diff -Nru lsvpd-1.6.4.orig/Makefile.am lsvpd-1.6.4/Makefile.am
+--- lsvpd-1.6.4.orig/Makefile.am	2008-03-12 21:14:32.000000000 +0100
++++ lsvpd-1.6.4/Makefile.am	2008-06-30 19:43:44.000000000 +0200
+@@ -40,7 +40,7 @@
+ lsmcode_SOURCES = src/output/lsmcode.cpp \
+ 		$(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. -lz -lstdc++ -lvpd_cxx
+ lsvpd_LDFLAGS = -Wall
+diff -Nru lsvpd-1.6.4.orig/Makefile.in lsvpd-1.6.4/Makefile.in
+--- lsvpd-1.6.4.orig/Makefile.in	2008-04-25 23:23:11.000000000 +0200
++++ lsvpd-1.6.4/Makefile.in	2008-06-30 19:43:54.000000000 +0200
+@@ -239,7 +239,7 @@
+ lsmcode_SOURCES = src/output/lsmcode.cpp \
+ 		$(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. -lz -lstdc++ -lvpd_cxx
+ lsvpd_LDFLAGS = -Wall

lsvpd.spec

@@ -1,9 +1,9 @@
 %define name lsvpd
-%define version 1.6.8
+%define version 1.6.10
 
 Name:		%{name}
 Version:	%{version}
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	VPD/hardware inventory utilities for Linux
 
 Group:		Applications/System
@@ -11,8 +11,10 @@ License:	GPLv2+
 URL:		http://linux-diag.sf.net/Lsvpd.html
 Source0:	http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
 Patch1:		lsvpd-1.6.7-ids-lookup.patch
+Patch2:		lsvpd-1.6.10-sg3_utils.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	sg3_utils-devel libvpd-devel zlib-devel automake libtool
+BuildRequires:	libvpd-devel >= 2.1.2
+BuildRequires:	sg3_utils-devel zlib-devel automake libtool
 Requires(post): /usr/sbin/vpdupdate
 
 # By default, build without librtas because it does not yet exist in Fedora
@@ -42,6 +44,7 @@ on POWER PC based systems.
 %prep
 %setup -q
 %patch1 -p0 -b .lookup
+%patch2 -p1 -b .sg3_utils
 
 %build
 ./bootstrap.sh
@@ -75,6 +78,9 @@ on POWER PC based systems.
 %dir %{_sysconfdir}/lsvpd
 
 %changelog
+* Tue Feb 15 2011 Jiri Skala <jskala@redhat.com> - 1.6.10-1
+- rebase to latest upstream 1.6.10
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

sources

@@ -1 +1 @@
-8e12c24e108b3180ce1ca623907ea196  lsvpd-1.6.8.tar.gz
+36b6378586c9566c18175d7612069e41  lsvpd-1.6.10.tar.gz