Update to latest upstream 1.7.3

Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
This commit is contained in:
Vasant Hegde 2014-03-10 11:33:02 +05:30
parent fdbe406d21
commit 800dc88ec3
4 changed files with 15 additions and 24 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ lsvpd-1.6.8.tar.gz
/lsvpd-1.6.12.tar.gz /lsvpd-1.6.12.tar.gz
/lsvpd-1.7.1.tar.gz /lsvpd-1.7.1.tar.gz
/lsvpd-1.7.2.tar.gz /lsvpd-1.7.2.tar.gz
/lsvpd-1.7.3.tar.gz

View File

@ -1,13 +0,0 @@
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

View File

@ -1,23 +1,21 @@
%define name lsvpd %define name lsvpd
%define version 1.7.2 %define version 1.7.3
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
Release: 3%{?dist} Release: 1%{?dist}
Summary: VPD/hardware inventory utilities for Linux Summary: VPD/hardware inventory utilities for Linux
Group: Applications/System Group: Applications/System
License: GPLv2+ License: GPLv2+
URL: http://linux-diag.sf.net/Lsvpd.html URL: http://linux-diag.sf.net/Lsvpd.html
Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
# invscout command is shipped in IBMinvscout package, which
# is not yet exist in Fedora. Hence exclude building invscout.
Patch1: lsvpd-1.7.1-exclude_invscout.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libvpd-devel >= 2.2.1 BuildRequires: libvpd-devel >= 2.2.1
BuildRequires: sg3_utils-devel zlib-devel automake libtool BuildRequires: sg3_utils-devel zlib-devel automake libtool
BuildRequires: librtas-devel BuildRequires: librtas-devel
Requires(post): /usr/sbin/vpdupdate
Requires(post): %{_sbindir}/vpdupdate
ExclusiveArch: ppc ppc64 ppc64le ExclusiveArch: ppc ppc64 ppc64le
@ -34,7 +32,6 @@ on POWER PC based systems.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .exclude_invscout
%build %build
./bootstrap.sh ./bootstrap.sh
@ -48,7 +45,10 @@ on POWER PC based systems.
%{__rm} -rf $RPM_BUILD_ROOT %{__rm} -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT %{__make} install DESTDIR=$RPM_BUILD_ROOT
%post -p /usr/sbin/vpdupdate %post
%{_sbindir}/vpdupdate &
# Ignore the vpdupdate failures and enforce a success
exit 0
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -68,6 +68,9 @@ on POWER PC based systems.
%dir %{_sysconfdir}/lsvpd %dir %{_sysconfdir}/lsvpd
%changelog %changelog
* Mon Mar 10 2014 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 1.7.3
- Update to latest upstream 1.7.3
* Thu Oct 10 2013 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 1.7.2-3 * Thu Oct 10 2013 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 1.7.2-3
- Add ppc64le architecture - Add ppc64le architecture

View File

@ -1 +1 @@
6510f92adf22d6cf77d10160d73c93f8 lsvpd-1.7.2.tar.gz 0672af9e929aae78162c30599feabbe2 lsvpd-1.7.3.tar.gz