diff --git a/.gitignore b/.gitignore index 6375609..81114b3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ lsvpd-1.6.8.tar.gz /lsvpd-1.6.12.tar.gz /lsvpd-1.7.1.tar.gz /lsvpd-1.7.2.tar.gz +/lsvpd-1.7.3.tar.gz diff --git a/lsvpd-1.6.12-sg3_utils.patch b/lsvpd-1.6.12-sg3_utils.patch deleted file mode 100644 index 63c32fe..0000000 --- a/lsvpd-1.6.12-sg3_utils.patch +++ /dev/null @@ -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 diff --git a/lsvpd.spec b/lsvpd.spec index 0047909..249166e 100644 --- a/lsvpd.spec +++ b/lsvpd.spec @@ -1,23 +1,21 @@ %define name lsvpd -%define version 1.7.2 +%define version 1.7.3 Name: %{name} Version: %{version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: VPD/hardware inventory utilities for Linux Group: Applications/System License: GPLv2+ URL: http://linux-diag.sf.net/Lsvpd.html 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) BuildRequires: libvpd-devel >= 2.2.1 BuildRequires: sg3_utils-devel zlib-devel automake libtool BuildRequires: librtas-devel -Requires(post): /usr/sbin/vpdupdate + +Requires(post): %{_sbindir}/vpdupdate ExclusiveArch: ppc ppc64 ppc64le @@ -34,23 +32,25 @@ on POWER PC based systems. %prep %setup -q -%patch1 -p1 -b .exclude_invscout %build ./bootstrap.sh %configure %{__make} %{?_smp_mflags} -%clean +%clean %{__rm} -rf $RPM_BUILD_ROOT %install %{__rm} -rf $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,-) %doc COPYING INSTALL NEWS README %{_sbindir}/lsvpd @@ -68,6 +68,9 @@ on POWER PC based systems. %dir %{_sysconfdir}/lsvpd %changelog +* Mon Mar 10 2014 Vasant Hegde - 1.7.3 +- Update to latest upstream 1.7.3 + * Thu Oct 10 2013 Vasant Hegde - 1.7.2-3 - Add ppc64le architecture diff --git a/sources b/sources index 504ba2a..be1d35f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6510f92adf22d6cf77d10160d73c93f8 lsvpd-1.7.2.tar.gz +0672af9e929aae78162c30599feabbe2 lsvpd-1.7.3.tar.gz