!2 Fix build fail

Merge pull request !2 from lyn/master
This commit is contained in:
openeuler-ci-bot 2020-09-07 09:06:06 +08:00 committed by Gitee
commit 7af790bccb

View File

@ -1,8 +1,9 @@
%bcond_with bootstrap
%global gem_name eventmachine %global gem_name eventmachine
%{!?network: %global network 0} %{!?network: %global network 0}
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Version: 1.2.7 Version: 1.2.7
Release: 1 Release: 2
Summary: Ruby/EventMachine library Summary: Ruby/EventMachine library
License: GPLv2 or Ruby License: GPLv2 or Ruby
URL: http://rubyeventmachine.com URL: http://rubyeventmachine.com
@ -11,11 +12,7 @@ Patch0: rubygem-eventmachine-1.2.7-OpenSSL-1.1.0-test-updates.patch
Patch1: rubygem-eventmachine-1.2.7-Update-runtime-files-for-TLS13-no-SSL-OpenSSL-lib-info.patch Patch1: rubygem-eventmachine-1.2.7-Update-runtime-files-for-TLS13-no-SSL-OpenSSL-lib-info.patch
Patch2: rubygem-eventmachine-1.2.7-Move-console-SSL-Info-code-to-em_test_helper.patch Patch2: rubygem-eventmachine-1.2.7-Move-console-SSL-Info-code-to-em_test_helper.patch
Patch3: rubygem-eventmachine-1.2.7-Openssl-1.1.1-updates.patch Patch3: rubygem-eventmachine-1.2.7-Openssl-1.1.1-updates.patch
BuildRequires: ruby(release) BuildRequires: ruby(release) rubygems-devel ruby-devel gcc-c++ openssl-devel
BuildRequires: rubygems-devel
BuildRequires: ruby-devel
BuildRequires: gcc-c++
BuildRequires: openssl-devel
BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit)
%description %description
EventMachine implements a fast, single-threaded engine for arbitrary network EventMachine implements a fast, single-threaded engine for arbitrary network
@ -56,6 +53,7 @@ mkdir -p %{buildroot}%{gem_extdir_mri}
cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/ cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/
rm -rf %{buildroot}%{gem_instdir}/ext/ rm -rf %{buildroot}%{gem_instdir}/ext/
%if %{with bootstrap}
%check %check
pushd .%{gem_instdir} pushd .%{gem_instdir}
ruby -Ilib:$(dirs +1)%{gem_extdir_mri}:tests -e "Dir.glob './tests/**/test_*.rb', &method(:require)" -- \ ruby -Ilib:$(dirs +1)%{gem_extdir_mri}:tests -e "Dir.glob './tests/**/test_*.rb', &method(:require)" -- \
@ -81,6 +79,7 @@ ruby -Ilib:$(dirs +1)%{gem_extdir_mri}:tests -e "Dir.glob './tests/**/test_*.rb'
--ignore-name=/^test_nameserver$/ \ --ignore-name=/^test_nameserver$/ \
%endif %endif
popd popd
%endif
%files %files
%dir %{gem_instdir} %dir %{gem_instdir}
@ -102,5 +101,8 @@ popd
%{gem_instdir}/tests %{gem_instdir}/tests
%changelog %changelog
* Sat Sep 5 2020 liyanan <liyanan32@huawei.com> - 1.2.7-2
- fix build fail
* Sat Jul 25 2020 wutao <wutao61@huawei.com> - 1.2.7-1 * Sat Jul 25 2020 wutao <wutao61@huawei.com> - 1.2.7-1
- package init - package init