Fix jr_jackson remove due to tests failed
Signed-off-by: cherry530 <xuping33@huawei.com> (cherry picked from commit 6d9aaa2f85914741eea794389273c214fb946dbc)
This commit is contained in:
parent
4786a6a833
commit
c739d351c3
Binary file not shown.
@ -1,22 +1,24 @@
|
|||||||
%global pkg_name %{name}
|
%global pkg_name %{name}
|
||||||
%global gem_name multi_json
|
%global gem_name multi_json
|
||||||
|
|
||||||
Summary: A gem to provide swappable JSON backends
|
Summary: A gem to provide swappable JSON backends
|
||||||
Name: rubygem-%{gem_name}
|
Name: rubygem-%{gem_name}
|
||||||
Version: 1.14.1
|
Version: 1.14.1
|
||||||
Release: 1
|
Release: 2
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://github.com/intridea/multi_json
|
URL: https://github.com/intridea/multi_json
|
||||||
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
|
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
|
||||||
Source1: %{gem_name}-%{version}-tests.tgz
|
#git clone https://github.com/intridea/multi_json.git && cd multi_json
|
||||||
Source2: https://github.com/intridea/%{gem_name}/archive/refs/tags/%{gem_name}-%{version}.tar.gz
|
#git archive -v -o multi_json-1.14.1-tests.tgz v1.14.1 spec/
|
||||||
|
Source1: %{gem_name}-%{version}-tests.tgz
|
||||||
|
Source2: https://github.com/intridea/%{gem_name}/archive/refs/tags/%{gem_name}-%{version}.tar.gz
|
||||||
|
|
||||||
Requires: ruby(release)
|
Requires: ruby(release)
|
||||||
BuildRequires: ruby(release)
|
BuildRequires: ruby(release)
|
||||||
|
|
||||||
Requires: ruby(rubygems)
|
Requires: ruby(rubygems)
|
||||||
Requires: ruby
|
Requires: ruby
|
||||||
|
|
||||||
BuildRequires: rubygems-devel
|
BuildRequires: rubygems-devel
|
||||||
BuildRequires: ruby
|
BuildRequires: ruby
|
||||||
@ -24,11 +26,11 @@ BuildRequires: rubygem(rspec)
|
|||||||
BuildRequires: rubygem(json_pure)
|
BuildRequires: rubygem(json_pure)
|
||||||
BuildRequires: ruby(rubygems)
|
BuildRequires: ruby(rubygems)
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Provides: rubygem(%{gem_name}) = %{version}
|
Provides: rubygem(%{gem_name}) = %{version}
|
||||||
|
|
||||||
# OkJson is allowed to be bundled:
|
# OkJson is allowed to be bundled:
|
||||||
Provides: bundled(okjson) = 20110719
|
Provides: bundled(okjson) = 20110719
|
||||||
|
|
||||||
%description
|
%description
|
||||||
A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem,
|
A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem,
|
||||||
@ -36,10 +38,10 @@ JSON pure, or a vendored version of okjson.
|
|||||||
|
|
||||||
|
|
||||||
%package doc
|
%package doc
|
||||||
Summary: Documentation for %{pkg_name}
|
Summary: Documentation for %{pkg_name}
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
Requires: %{pkg_name} = %{version}-%{release}
|
Requires: %{pkg_name} = %{version}-%{release}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description doc
|
%description doc
|
||||||
Documentation for %{pkg_name}
|
Documentation for %{pkg_name}
|
||||||
@ -59,12 +61,10 @@ cp -a .%{gem_dir}/* \
|
|||||||
%check
|
%check
|
||||||
pushd .%{gem_instdir}
|
pushd .%{gem_instdir}
|
||||||
tar xf %{SOURCE1}
|
tar xf %{SOURCE1}
|
||||||
sed -i '138,165 s/^/#/' spec/multi_json_spec.rb
|
|
||||||
sed -i "/expect(MultiJson.adapter.to_s).to eq('MultiJson::Adapters::Oj')/ s/Oj/JsonGem/" spec/multi_json_spec.rb
|
sed -i "/expect(MultiJson.adapter.to_s).to eq('MultiJson::Adapters::Oj')/ s/Oj/JsonGem/" spec/multi_json_spec.rb
|
||||||
rspec spec/{multi_json,options_cache}_spec.rb
|
SKIP_ADAPTERS=jr_jackson rspec spec/{multi_json,options_cache}_spec.rb
|
||||||
rm spec/{oj,yajl}_adapter_spec.rb
|
|
||||||
for adapter in spec/*_adapter_spec.rb; do
|
for adapter in spec/*_adapter_spec.rb; do
|
||||||
rspec $adapter
|
SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization,oj,yajl rspec $adapter
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@ -85,6 +85,10 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 14 2022 xu_ping <xuping33@huawei.com> - 1.14.1-2
|
||||||
|
- Modify the tests file to correct version 1.14.1
|
||||||
|
- Fix jr_jackson remove due to tests failed
|
||||||
|
|
||||||
* Mon Jun 07 2021 jiangxinyu <jiangxinyu@kylinos.cn> - 1.14.1-1
|
* Mon Jun 07 2021 jiangxinyu <jiangxinyu@kylinos.cn> - 1.14.1-1
|
||||||
- Update version to 1.14.1
|
- Update version to 1.14.1
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user