From 3a09a46c6b19373faa20415b2d6fca93bcd164a2 Mon Sep 17 00:00:00 2001 From: tingtli Date: Fri, 11 Nov 2016 12:09:33 +0800 Subject: [PATCH] fix a typo to build correct lenovo and notlenovo packages (#2145) --- xCAT-server/xCAT-server.spec | 2 +- xCAT/xCAT.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index 3e86317dbe..6974147432 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -308,7 +308,7 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC.pm rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring/snmpmon.pm rm $RPM_BUILD_ROOT/%{prefix}/sbin/xcat_traphandler %endif -%if lenovo +%if %lenovo rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC.pm rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpilo.pm rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpblade.pm diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index 5e5cb0c58d..1c558d9be4 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -27,7 +27,7 @@ Provides: xCAT = %{version} Conflicts: xCATsn %define lenovo %(if [ "$lenovobuild" = "1" ];then echo 1; else echo 0; fi) %define notlenovo %(if [ "$lenovobuild" = "1" ];then echo 0; else echo 1; fi) -%if lenovo +%if %lenovo Requires: xCAT-server xCAT-client perl-DBD-SQLite xCAT-probe >= 2.12.1 xCAT-genesis-scripts-x86_64 %else Requires: xCAT-server xCAT-client perl-DBD-SQLite xCAT-probe >= 2.12.1 xCAT-genesis-scripts-x86_64 xCAT-genesis-scripts-ppc64