Update to latest upstream 1.7.5

Also remove unused additional patches.

Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>

.gitignore

@@ -6,3 +6,4 @@ lsvpd-1.6.8.tar.gz
 /lsvpd-1.7.2.tar.gz
 /lsvpd-1.7.3.tar.gz
 /lsvpd-1.7.4.tar.gz
+/lsvpd-1.7.5.tar.gz

lsvpd-1.7.1-exclude_invscout.patch

@@ -1,75 +0,0 @@
-From 3e74a75b6062225e65b757c3148e91e863bf7688 Mon Sep 17 00:00:00 2001
-From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
-Date: Sun, 15 Sep 2013 17:43:13 +0530
-Subject: [PATCH] Exclude invscout command from lsvpd package
-
-invscout command is shipped in IBMInvscout package, which
-is not yet available in Fedora. Hence do not compile
-invscout command.
-
-Note: Some day, if IBM wants to ship IBMInvscout package in Fedora,
-      then we need to modify lspvd spec file to generate
-      IBMInvscout package. (similar to upstream lsvpd spec file).
-
-Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
----
- Makefile.am   | 9 ++-------
- docs/Makefile | 2 +-
- 2 files changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 4b3d9d7..d132f2b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -12,7 +12,7 @@ update_h_files = src/include/device.hpp \
- 
- INCLUDES = -I./src/include
- 
--sbin_PROGRAMS = vpdupdate lsvpd lscfg lsvio lsmcode invscout
-+sbin_PROGRAMS = vpdupdate lsvpd lscfg lsvio lsmcode
- 
- vpdupdate_SOURCES = src/internal/sys_interface/devicetreecollector.cpp \
- 		src/internal/sys_interface/fswalk.cpp \
-@@ -43,9 +43,6 @@ lsmcode_SOURCES = src/output/lsmcode.cpp \
- 		  src/internal/sys_interface/rtascollector.cpp \
- 		$(update_h_files)
- 
--invscout_SOURCES = src/output/invscout.cpp \
--		$(update_h_files)
--
- vpdupdate_LDADD = -lz -lstdc++ -lvpd_cxx
- if SGUTIL1
- vpdupdate_LDADD += -lsgutils
-@@ -64,8 +61,6 @@ lsvio_LDADD = -lz -lstdc++ -lvpd_cxx
- lsvio_LDFLAGS = -Wall
- lsmcode_LDADD = -lz -lstdc++ -lvpd_cxx
- lsmcode_LDFLAGS = -Wall
--invscout_LDADD = -lz -lstdc++ -lvpd_cxx
--invscout_LDFLAGS = -Wall
- 
- AM_CXXFLAGS = -DDEST_DIR='"${exec_prefix}"' -DVPD_VERSION='"@VERSION@"'
- 
-@@ -77,6 +72,6 @@ install-exec-hook:
- 	install -D --mode=644 cpu_mod_conv.conf \
- 		${DESTDIR}/etc/lsvpd/cpu_mod_conv.conf
- 
--EXTRA_DIST = docs/lsvpd.8 docs/lscfg.8 docs/lsvio.8 docs/lsmcode.8 docs/invscout.8 \
-+EXTRA_DIST = docs/lsvpd.8 docs/lscfg.8 docs/lsvio.8 docs/lsmcode.8 \
- 		docs/vpdupdate.8 docs/Makefile docs/install.html \
- 		bootstrap.sh scsi_templates.conf cpu_mod_conv.conf
-diff --git a/docs/Makefile b/docs/Makefile
-index 08309db..280607e 100755
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -3,7 +3,7 @@ MAN_STYLE = $(STYLE_PATH)/manpages/docbook.xsl
- XHTML_STYLE = $(STYLE_PATH)/xhtml/docbook.xsl
- FOP_STYLE = $(STYLE_PATH)/fo/docbook.xsl
- 
--MANPAGES = lsvpd.8 lscfg.8 lsmcode.8 lsvio.8 vpdupdate.8 invscout.8
-+MANPAGES = lsvpd.8 lscfg.8 lsmcode.8 lsvio.8 vpdupdate.8
- HTMLS = install.html
- 
- INSTALL = /usr/bin/install -c
--- 
-1.7.11.7
-

lsvpd-1.7.4-fix-license-issue.patch

@@ -1,31 +0,0 @@
-From daed51bc06aed809d8ec55a95c05a9670631806a Mon Sep 17 00:00:00 2001
-From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
-Date: Tue, 8 Apr 2014 22:07:07 +0530
-Subject: [PATCH] License: Grant permission to link with librtas library
-
-Reported-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
-Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
----
- COPYING | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/COPYING b/COPYING
-index 5ec43ee..b1f3c2a 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,3 +1,11 @@
-+Special Exception:
-+  As a special exception, IBM gives permission to link the code
-+of portions of this program against the librtas library, and
-+distribute linked combinations including the two. You must obey
-+the GNU General Public License in all respects for all of the
-+code used other than librtas.
-+
-+
- 		    GNU GENERAL PUBLIC LICENSE
- 		       Version 2, June 1991
- 
--- 
-1.8.3.1
-

lsvpd.spec

@@ -15,9 +15,6 @@ BuildRequires:	libvpd-devel >= 2.2.1
 BuildRequires:	sg3_utils-devel zlib-devel automake libtool
 BuildRequires:	librtas-devel
 
-# Grant permission to link with librtas library
-Patch0:		lsvpd-1.7.4-fix-license-issue.patch
-
 Requires(post): %{_sbindir}/vpdupdate
 
 ExclusiveArch: ppc ppc64 ppc64le
@@ -35,7 +32,6 @@ on POWER PC based systems.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-license-issue
 
 %build
 ./bootstrap.sh
@@ -72,6 +68,9 @@ exit 0
 %dir %{_sysconfdir}/lsvpd
 
 %changelog
+* Mon Sep 22 2014 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 1.7.5
+- Update to latest upstream 1.7.5
+
 * Fri Aug 01 2014 Brent Baude <bbaude@redhat.com> - 1.7.4-4
 - NVR bump for Fedora 21 build on merged koji
 

sources

@@ -1 +1 @@
-8caa63a0e8c187fc44e3adf096a75d64  lsvpd-1.7.4.tar.gz
+c301c1e19987475af816414a066b689f  lsvpd-1.7.5.tar.gz