From 0c02b0301b7dbbf514a27e44d204104ac79150ad Mon Sep 17 00:00:00 2001
From: Roman Rakus <rrakus@fedoraproject.org>
Date: Tue, 6 Apr 2010 15:47:24 +0000
Subject: [PATCH] Version 1.6.8 (need ugly bootstrap)

---
 .cvsignore                       |  2 +-
 lsvpd-1.6.4-sg3_utils-1.26.patch | 24 ------------------------
 lsvpd.spec                       | 14 ++++++++------
 sources                          |  2 +-
 4 files changed, 10 insertions(+), 32 deletions(-)
 delete mode 100644 lsvpd-1.6.4-sg3_utils-1.26.patch

diff --git a/.cvsignore b/.cvsignore
index 306cc08..e3b2fce 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lsvpd-1.6.7.tar.gz
+lsvpd-1.6.8.tar.gz
diff --git a/lsvpd-1.6.4-sg3_utils-1.26.patch b/lsvpd-1.6.4-sg3_utils-1.26.patch
deleted file mode 100644
index 179dff4..0000000
--- a/lsvpd-1.6.4-sg3_utils-1.26.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
diff --git a/lsvpd.spec b/lsvpd.spec
index 63d40e7..d18d682 100644
--- a/lsvpd.spec
+++ b/lsvpd.spec
@@ -1,5 +1,5 @@
 %define name lsvpd
-%define version 1.6.7
+%define version 1.6.8
 
 Name:		%{name}
 Version:	%{version}
@@ -9,11 +9,10 @@ Summary:	VPD/hardware inventory utilities for Linux
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://linux-diag.sf.net/Lsvpd.html
-Source:		http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-Patch0:		lsvpd-1.6.4-sg3_utils-1.26.patch
+Source0:	http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
 Patch1:		lsvpd-1.6.7-ids-lookup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	sg3_utils-devel libvpd-devel zlib-devel
+BuildRequires:	sg3_utils-devel libvpd-devel zlib-devel automake libtool
 Requires(post): /usr/sbin/vpdupdate
 
 # By default, build without librtas because it does not yet exist in Fedora
@@ -42,10 +41,10 @@ on POWER PC based systems.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
+%patch1 -p0 -b .lookup
 
 %build
+./bootstrap.sh
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -76,6 +75,9 @@ on POWER PC based systems.
 %dir %{_sysconfdir}/lsvpd
 
 %changelog
+* Tue Apr 06 2010 Roman Rakus <rrakus@redhat.com> - 1.6.8-1
+- Version 1.6.8 (need ugly bootstrap)
+
 * Wed Dec 02 2009 Eric Munson <ebmunson@us.ibm.com> - 1.6.7-1
 - Update to latest lsvpd release
 - Add librtas support to build on POWERPC
diff --git a/sources b/sources
index 82b381b..9ff8d7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97e6363177ee6c5dbf0cb198f5554af8  lsvpd-1.6.7.tar.gz
+8e12c24e108b3180ce1ca623907ea196  lsvpd-1.6.8.tar.gz