[lsvpd] Exclude invscout command from lsvpd package

[Vasant Hegde]

commit 65e18a5fe8ff28c7af372631608a37f8568d5b68
Author: Vasant Hegde <hegdevasant at linux.vnet.ibm.com>
Date:   Tue May 21 15:48:26 2013 +0530

    Exclude invscout command from lsvpd package

 lsvpd-1.7.1-exclude_invscout.patch |   66 ++++++++++++++++++++++++++++++++++++
 lsvpd.spec                         |    5 +++
 2 files changed, 71 insertions(+), 0 deletions(-)
---
diff --git a/lsvpd-1.7.1-exclude_invscout.patch b/lsvpd-1.7.1-exclude_invscout.patch
new file mode 100644
index 0000000..aab7430
--- /dev/null
+++ b/lsvpd-1.7.1-exclude_invscout.patch
@@ -0,0 +1,66 @@
+
+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).
+
+---
+diff --git a/Makefile.am b/Makefile.am
+index 9e5d4ba..52abb8f 100755
+--- 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@"'
+ 
+@@ -97,7 +92,7 @@ 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 \
+ 		Doxyfile bootstrap.sh
+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
diff --git a/lsvpd.spec b/lsvpd.spec
index c850706..e1a7342 100644
--- a/lsvpd.spec
+++ b/lsvpd.spec
@@ -11,6 +11,9 @@ 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
+# invscout command is shipped in IBMinvscout package, which
+# is not yet exist in Fedora. Hence exclude building invscout.
+Patch2:		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
@@ -33,6 +36,7 @@ on POWER PC based systems.
 %prep
 %setup -q
 %patch1 -p0 -b .lookup
+%patch2 -p1 -b .exclude_invscout
 
 %build
 ./bootstrap.sh
@@ -68,6 +72,7 @@ on POWER PC based systems.
 %changelog
 * Tue May 21 2013 Vasant Hegde <hegdevasant at linux.vnet.ibm.com>
 - Update to latest upstream 1.7.1
+- Exclude invscout command from lsvpd package
 
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild