From 11fc0716a668ec8adac90a2574ab6cd1682754e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 6 Nov 2020 11:08:53 +0100 Subject: [PATCH] Drop `BR: rubygem(json_pure)`. --- rubygem-multi_json.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/rubygem-multi_json.spec b/rubygem-multi_json.spec index a33b47f..d41b11e 100644 --- a/rubygem-multi_json.spec +++ b/rubygem-multi_json.spec @@ -15,7 +15,6 @@ BuildRequires: ruby(release) BuildRequires: rubygems-devel >= 1.3.5 BuildRequires: ruby BuildRequires: rubygem(rspec) -BuildRequires: rubygem(json_pure) BuildArch: noarch # OkJson is allowed to be bundled: # https://fedorahosted.org/fpc/ticket/113 @@ -55,18 +54,23 @@ cp -a .%{gem_dir}/* \ pushd .%{gem_instdir} ln -s %{_builddir}/spec spec +# json_pures is not available on Fedora. +sed -i "/require.*json\/pure/ s/^/#/" spec/multi_json_spec.rb +sed -i "s/JsonPure/OkJson/" spec/multi_json_spec.rb +sed -i "s/json_pure/ok_json/" spec/multi_json_spec.rb # oj is not available on Fedora. sed -i "/expect(MultiJson.adapter.to_s).to eq('MultiJson::Adapters::Oj')/ s/Oj/JsonGem/" spec/multi_json_spec.rb # Execute main test suite. SKIP_ADAPTERS=jr_jackson rspec spec/{multi_json,options_cache}_spec.rb -#rm spec/{oj,yajl}_adapter_spec.rb +# json_pure adapter does not support skipping :/ +mv spec/json_pure_adapter_spec.rb{,.disable} # Adapters have to be tested separately, but disable test of engines # unsupported on Fedora (they may cause test suite to fail). for adapter in spec/*_adapter_spec.rb; do - SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization,oj,yajl rspec $adapter + SKIP_ADAPTERS=json_pure,gson,jr_jackson,nsjsonserialization,oj,yajl rspec $adapter done popd @@ -88,6 +92,7 @@ popd * Fri Nov 06 2020 Vít Ondruch - 1.15.0-1 - Update to MultiJSON 1.15.0. Resolves: rhbz#1855521 +- Drop `BR: rubygem(json_pure)`. * Wed Jul 29 2020 Fedora Release Engineering - 1.14.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild