diff --git a/lsvpd-1.6.10-sg3_utils.patch b/lsvpd-1.6.10-sg3_utils.patch deleted file mode 100644 index 6cbb985..0000000 --- a/lsvpd-1.6.10-sg3_utils.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up lsvpd-1.6.11/Makefile.am.sg3_utils lsvpd-1.6.11/Makefile.am ---- lsvpd-1.6.11/Makefile.am.sg3_utils 2011-06-16 00:59:59.000000000 +0200 -+++ lsvpd-1.6.11/Makefile.am 2011-08-10 10:46:56.621688630 +0200 -@@ -40,7 +40,7 @@ lsvio_SOURCES = src/output/lsvio.cpp \ - lsmcode_SOURCES = src/output/lsmcode.cpp \ - $(update_h_files) - --vpdupdate_LDADD = -lz -lstdc++ -lvpd_cxx -lsgutils -+vpdupdate_LDADD = -lz -lstdc++ -lvpd_cxx -lsgutils2 - vpdupdate_LDFLAGS = -Wall - lsvpd_LDADD = -lz -lstdc++ -lvpd_cxx - lsvpd_LDFLAGS = -Wall diff --git a/lsvpd-1.6.12-sg3_utils.patch b/lsvpd-1.6.12-sg3_utils.patch new file mode 100644 index 0000000..63c32fe --- /dev/null +++ b/lsvpd-1.6.12-sg3_utils.patch @@ -0,0 +1,13 @@ +diff -up lsvpd-1.6.12/Makefile.am.sg3_utils lsvpd-1.6.12/Makefile.am +--- lsvpd-1.6.12/Makefile.am.sg3_utils 2011-12-08 09:27:59.000000000 +0100 ++++ lsvpd-1.6.12/Makefile.am 2012-05-04 16:22:53.738981152 +0200 +@@ -40,7 +40,8 @@ lsvio_SOURCES = src/output/lsvio.cpp \ + lsmcode_SOURCES = src/output/lsmcode.cpp \ + $(update_h_files) + +-vpdupdate_LDADD = -lz -lstdc++ -lvpd_cxx ++vpdupdate_LDADD = -lz -lstdc++ -lvpd_cxx -lsgutils2 ++ + if SGUTIL1 + vpdupdate_LDADD += -lsgutils + endif diff --git a/lsvpd.spec b/lsvpd.spec index 998c171..a054904 100644 --- a/lsvpd.spec +++ b/lsvpd.spec @@ -3,7 +3,7 @@ Name: %{name} Version: %{version} -Release: 5%{?dist} +Release: 1%{?dist} Summary: VPD/hardware inventory utilities for Linux Group: Applications/System @@ -11,7 +11,7 @@ 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 +Patch2: lsvpd-1.6.12-sg3_utils.patch Patch3: lsvpd-1.6.11-lsmopts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libvpd-devel >= 2.1.3 @@ -24,7 +24,7 @@ Requires(post): /usr/sbin/vpdupdate # librtas on POWER BuildRequires: librtas-devel -ExclusiveArch: ppc ppc64 +#ExclusiveArch: ppc ppc64 %description The lsvpd package contains all of the lsvpd, lscfg and lsmcode @@ -75,7 +75,7 @@ on POWER PC based systems. %dir %{_sysconfdir}/lsvpd %changelog -* Fri May 04 2012 Karsten Hopp 1.6.12-5 +* Fri May 04 2012 Karsten Hopp 1.6.12-1 - update to 1.6.12 * Tue Feb 28 2012 Fedora Release Engineering - 1.6.11-5