diff --git a/.gitignore b/.gitignore index a99f876..aefffe8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /erubi-*.gem +/erubi-*-test.tar.gz diff --git a/rubygem-erubi.spec b/rubygem-erubi.spec index 650fabe..8fd75d0 100644 --- a/rubygem-erubi.spec +++ b/rubygem-erubi.spec @@ -2,12 +2,15 @@ %global gem_name erubi Name: rubygem-%{gem_name} -Version: 1.7.0 -Release: 7%{?dist} +Version: 1.10.0 +Release: 1%{?dist} Summary: Small ERB Implementation License: MIT URL: https://github.com/jeremyevans/erubi Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +# git clone https://github.com/jeremyevans/erubi.git && cd erubi +# git archive -v -o erubi-1.10.0-test.tar.gz 1.10.0 test/ +Source1: %{gem_name}-%{version}-test.tar.gz BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby @@ -27,15 +30,11 @@ BuildArch: noarch Documentation for %{name}. %prep -gem unpack %{SOURCE0} - -%setup -q -D -T -n %{gem_name}-%{version} - -gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec +%setup -q -n %{gem_name}-%{version} -b 1 %build # Create the gem as gem install only works on a gem file -gem build %{gem_name}.gemspec +gem build ../%{gem_name}-%{version}.gemspec # %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir # by default, so that we can move it into the buildroot in %%install @@ -50,7 +49,13 @@ cp -a .%{gem_dir}/* \ %check pushd .%{gem_instdir} -ruby ./test/test.rb +ln -s %{_builddir}/test test + +# Avoid global_expectations dependency. +# https://github.com/jeremyevans/erubi/commit/592cabf3ddafeb65758b01317fe6fd4825e8e8a4 +sed -i '/require .minitest\/global_expectations\/autorun./ s/^/#/' test/test.rb + +ruby -rminitest/autorun ./test/test.rb popd %files @@ -65,9 +70,13 @@ popd %doc %{gem_instdir}/CHANGELOG %doc %{gem_instdir}/README.rdoc %{gem_instdir}/Rakefile -%{gem_instdir}/test %changelog +* Wed May 19 2021 Vít Ondruch - 1.10.0-1 +- Update to Erubi 1.10.0. + Resolves: rhbz#1551797 + Resolves: rhbz#1962124 + * Wed Jan 27 2021 Fedora Release Engineering - 1.7.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index f23d63e..0770512 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (erubi-1.7.0.gem) = 1494c28aebab08a82dffac7b340ff6e16edc8a3731f69ec568bec6cb0bda4a334f94033f43416812cd00b0c99dc98458867d963bef34796ebbdb11ea65dd8c1b +SHA512 (erubi-1.10.0-test.tar.gz) = bc3e0c339e3db51887514f59c06b1f8598ea0007fb63c44fc5af4a21ec269dee53ad5b09240f1c7051cf1e250d1cb96df631a6fff4cfdae338ec92b6ec579061 +SHA512 (erubi-1.10.0.gem) = 21bc96310ae6377e5e21fe5cece032ee084697e652639dbde1be94998bbeb876b7f5c938ee0f2a1605893f41974cf5f7b889f2b09cd834436f126b873d42ddec