!7 同步版本到master

From: @liqiuyu123 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek

rubygem-tzinfo.spec

@@ -1,13 +1,14 @@
-%bcond_with bootstrap
 %global gem_name tzinfo
 Name:                rubygem-%{gem_name}
-Version:             1.2.5
+Version:             2.0.4
-Release:             2
+Release:             1
 Summary:             Daylight savings aware timezone library
 License:             MIT
 URL:                 http://tzinfo.github.io
-Source0:             https://rubygems.org/gems/tzinfo-%{version}.gem
+Source0:             https://rubygems.org/gems/%{gem_name}-%{version}.gem
-BuildRequires:       ruby(release) rubygems-devel ruby rubygem(minitest) rubygem(thread_safe)
+Source1:             %{gem_name}-%{version}-tests.txz
+BuildRequires:       ruby(release) rubygems-devel ruby rubygem(minitest) rubygem(concurrent-ruby)
+BuildRequires:       rubygem(did_you_mean)
 BuildArch:           noarch
 %description
 TZInfo provides daylight savings aware transformations between times in
@@ -21,7 +22,7 @@ BuildArch:           noarch
 Documentation for %{name}.
 
 %prep
-%setup -q -n %{gem_name}-%{version}
+%setup -q -n %{gem_name}-%{version} -b1
 
 %build
 gem build ../%{gem_name}-%{version}.gemspec
@@ -32,13 +33,16 @@ mkdir -p %{buildroot}%{gem_dir}
 cp -a .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
-%if %{with bootstrap}
 %check
 pushd .%{gem_instdir}
-ruby -Ilib -e "require './test/ts_all'"
+ln -s %{_builddir}/test .
-ruby -Ilib -e "require './test/ts_all_zoneinfo.rb'"
+
+# We don't want to use bundler
+sed -i "/raise 'Tests must be run with bundler/ s/^/#/" \
+  test/test_utils.rb
+
+RUBYOPT="-I.:lib:test" ruby -rtest/ts_all
 popd
-%endif
 
 %files
 %dir %{gem_instdir}
@@ -52,13 +56,16 @@ popd
 %doc %{gem_docdir}
 %doc %{gem_instdir}/CHANGES.md
 %doc %{gem_instdir}/README.md
-%{gem_instdir}/Rakefile
-%{gem_instdir}/test
-%{gem_instdir}/%{gem_name}.gemspec
 
 %changelog
+* Web Mar 2 2022 liqiuyu <liqiuyu@kylinos.cn> - 2.0.4-1
+- update to 2.0.4
+
+* Mon Feb 21 2022 liyanan <liyanan32@huawei.com> - 1.2.5-3
+- fix check failed for rubygem-timecop
+
 * Sat Sep 5 2020 liyanan <liyanan32@huawei.com> - 1.2.5-2
 - fix build fail
 
 * Sat Aug 8 2020 yanan li <liyanan032@huawei.com> - 1.2.5-1
-- Package init
+- Package init