Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/rubygem-rspec-expectations into rawhide

This commit is contained in:
Mamoru TASAKA 2023-03-15 16:29:31 +09:00
commit c245fcdeba

View File

@ -3,7 +3,7 @@
%global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||')
%global fullver %{majorver}%{?preminorver} %global fullver %{majorver}%{?preminorver}
%global baserelease 1 %global baserelease 2
%global gem_name rspec-expectations %global gem_name rspec-expectations
@ -14,7 +14,7 @@
Summary: RSpec expectations (should and matchers) Summary: RSpec expectations (should and matchers)
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Version: %{majorver} Version: %{majorver}
Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist}.1 Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist}
# SPDX confirmed # SPDX confirmed
License: MIT License: MIT
@ -32,8 +32,10 @@ BuildRequires: rubygem(rake)
# Some features in expectations needs this # Some features in expectations needs this
BuildRequires: rubygem(rspec-support) >= 3.9.3 BuildRequires: rubygem(rspec-support) >= 3.9.3
BuildRequires: rubygem(minitest) >= 5 BuildRequires: rubygem(minitest) >= 5
%if ! 0%{?rhel}
BuildRequires: rubygem(aruba) BuildRequires: rubygem(aruba)
BuildRequires: rubygem(cucumber) BuildRequires: rubygem(cucumber)
%endif
BuildRequires: git BuildRequires: git
%endif %endif
BuildArch: noarch BuildArch: noarch
@ -68,11 +70,20 @@ cp -a .%{gem_dir}/* \
rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts}
%check %check
%if %{without bootstrap} %if %{with bootstrap}
# Skip test, exiting
exit 0
%endif
LANG=C.UTF-8 LANG=C.UTF-8
export RUBYLIB=$(pwd)/lib export RUBYLIB=$(pwd)/lib
rspec spec/ rspec spec/
%if 0%{?rhel}
# Skip cucumber test
exit 0
%endif
# Skip one failing scenario, needs investigating... # Skip one failing scenario, needs investigating...
sed -i features/built_in_matchers/include.feature -e '\@skip-on-fedora@d' sed -i features/built_in_matchers/include.feature -e '\@skip-on-fedora@d'
sed -i features/built_in_matchers/include.feature -e 's|^\([ \t]*\)\(Scenario: counts usage.*\)|\1@skip-on-fedora\n\1\2|' sed -i features/built_in_matchers/include.feature -e 's|^\([ \t]*\)\(Scenario: counts usage.*\)|\1@skip-on-fedora\n\1\2|'
@ -81,7 +92,6 @@ cucumber \
--tag "not @skip-when-diff-lcs-1.3" \ --tag "not @skip-when-diff-lcs-1.3" \
--tag "not @skip-on-fedora" \ --tag "not @skip-on-fedora" \
%{nil} %{nil}
%endif
%files %files
%dir %{gem_instdir} %dir %{gem_instdir}
@ -99,6 +109,9 @@ cucumber \
%{gem_docdir} %{gem_docdir}
%changelog %changelog
* Fri Mar 10 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 3.12.2-2
- Disable unwanted dependencies in RHEL builds
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-1.1 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild