From f4f37fe0eeda44a82d174ca224f813851d2809bb Mon Sep 17 00:00:00 2001 From: Vasant Hegde Date: Sun, 15 Sep 2013 18:12:05 +0530 Subject: [PATCH] Fix build issue. Signed-off-by: Vasant Hegde --- lsvpd-1.7.1-exclude_invscout.patch | 25 +++++++++++++++++-------- lsvpd.spec | 11 +++++++---- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/lsvpd-1.7.1-exclude_invscout.patch b/lsvpd-1.7.1-exclude_invscout.patch index aab7430..c07bad1 100644 --- a/lsvpd-1.7.1-exclude_invscout.patch +++ b/lsvpd-1.7.1-exclude_invscout.patch @@ -1,17 +1,24 @@ - -Exclude invscout command from lsvpd package +From 3e74a75b6062225e65b757c3148e91e863bf7688 Mon Sep 17 00:00:00 2001 +From: Vasant Hegde +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). + then we need to modify lspvd spec file to generate + IBMInvscout package. (similar to upstream lsvpd spec file). +Signed-off-by: Vasant Hegde --- + Makefile.am | 9 ++------- + docs/Makefile | 2 +- + 2 files changed, 3 insertions(+), 8 deletions(-) + diff --git a/Makefile.am b/Makefile.am -index 9e5d4ba..52abb8f 100755 +index 4b3d9d7..d132f2b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ update_h_files = src/include/device.hpp \ @@ -42,15 +49,14 @@ index 9e5d4ba..52abb8f 100755 AM_CXXFLAGS = -DDEST_DIR='"${exec_prefix}"' -DVPD_VERSION='"@VERSION@"' -@@ -97,7 +92,7 @@ install-exec-hook: +@@ -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 \ - Doxyfile bootstrap.sh + bootstrap.sh scsi_templates.conf cpu_mod_conv.conf diff --git a/docs/Makefile b/docs/Makefile index 08309db..280607e 100755 --- a/docs/Makefile @@ -64,3 +70,6 @@ index 08309db..280607e 100755 HTMLS = install.html INSTALL = /usr/bin/install -c +-- +1.7.11.7 + diff --git a/lsvpd.spec b/lsvpd.spec index c5ec9ec..7d31c5b 100644 --- a/lsvpd.spec +++ b/lsvpd.spec @@ -3,7 +3,7 @@ Name: %{name} Version: %{version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: VPD/hardware inventory utilities for Linux Group: Applications/System @@ -52,7 +52,7 @@ on POWER PC based systems. %files %defattr(-,root,root,-) -%doc COPYING INSTALL NEWS README TODO +%doc COPYING INSTALL NEWS README %{_sbindir}/lsvpd %{_sbindir}/lscfg %{_sbindir}/lsmcode @@ -68,6 +68,9 @@ on POWER PC based systems. %dir %{_sysconfdir}/lsvpd %changelog +* Sun Sep 15 2013 Vasant Hegde - 1.7.2-2 +- Fix build issue + * Thu Aug 22 2013 Vasant Hegde - 1.7.2 - Update to latest upstream 1.7.2 @@ -162,7 +165,7 @@ on POWER PC based systems. * Tue Mar 4 2008 - Eric Munson - 1.6.2-1 - Updating for lsvpd-1.6.2 -* Tue Mar 3 2008 - Eric Munson - 1.6.1-1 +* Mon Mar 3 2008 - Eric Munson - 1.6.1-1 - Updating for lsvpd-1.6.1 * Sat Feb 2 2008 - Eric Munson - 1.6.0-1 @@ -190,5 +193,5 @@ on POWER PC based systems. - Removing #! from the beginning of the file. - Fixes requested by Fedora Community -* Wed Oct 30 2007 - Eric Munson - 1.3.5-1 +* Tue Oct 30 2007 - Eric Munson - 1.3.5-1 - Remove calls to ldconfig