!2 change the use_vmguestlib 1 to use_vmguestlib 0

From: @jxy_git
Reviewed-by: @yangzhao_kl,@hjimmy
Signed-off-by: @hjimmy
This commit is contained in:
openeuler-ci-bot 2020-11-09 09:57:19 +08:00 committed by Gitee
commit 3c05181a2c
3 changed files with 10 additions and 12 deletions

Binary file not shown.

View File

@ -23,7 +23,7 @@
Name: corosync Name: corosync
Summary: The Corosync Cluster Engine and Application Programming Interfaces Summary: The Corosync Cluster Engine and Application Programming Interfaces
Version: 3.0.2 Version: 3.0.2
Release: 4%{?gitver}%{?dist}.1 Release: 5
License: BSD License: BSD
URL: http://corosync.github.io/corosync/ URL: http://corosync.github.io/corosync/
Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz
@ -31,9 +31,9 @@ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?git
%if %{with spausedd} %if %{with spausedd}
Source1: https://github.com/jfriesse/spausedd/releases/download/%{spausedd_version}/spausedd-%{spausedd_version}.tar.gz Source1: https://github.com/jfriesse/spausedd/releases/download/%{spausedd_version}/spausedd-%{spausedd_version}.tar.gz
# VMGuestLib exists only for x86_64 architecture # VMGuestLib exists only for x86_64 architecture
%ifarch x86_64 #%%ifarch x86_64
%global use_vmguestlib 1 #%%global use_vmguestlib 0
%endif #%%endif
%endif %endif
# Runtime bits # Runtime bits
@ -78,9 +78,9 @@ Requires: libxslt
%if %{with vqsim} %if %{with vqsim}
BuildRequires: readline-devel BuildRequires: readline-devel
%endif %endif
%if %{defined use_vmguestlib} # %%if %{defined use_vmguestlib}
BuildRequires: pkgconfig(vmguestlib) # BuildRequires: pkgconfig(vmguestlib)
%endif # %%endif
%prep %prep
%if %{with spausedd} %if %{with spausedd}
@ -132,11 +132,6 @@ make %{_smp_mflags}
cd spausedd-%{spausedd_version} cd spausedd-%{spausedd_version}
CFLAGS="${CFLAGS:-%{optflags}}" ; export CFLAGS CFLAGS="${CFLAGS:-%{optflags}}" ; export CFLAGS
make \ make \
%if %{defined use_vmguestlib}
WITH_VMGUESTLIB=1 \
%else
WITH_VMGUESTLIB=0 \
%endif
%{?_smp_mflags} %{?_smp_mflags}
%endif %endif
@ -387,5 +382,8 @@ fi
%endif %endif
%changelog %changelog
* Fri Oct 30 2020 jiangxinyu <jiangxinyu@kylinos.cn> - 3.0.2-5
- change the use_vmguestlib 1 to use_vmguestlib 0
* Mon Apr 13 2020 houjian<jian.hou@kylinos.cn> - 3.0.2-4.1 * Mon Apr 13 2020 houjian<jian.hou@kylinos.cn> - 3.0.2-4.1
- Init corosync project - Init corosync project

Binary file not shown.