diff --git a/.gitignore b/.gitignore index d4ae70d..21d0609 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /delayed_job_active_record-4.1.1.gem /delayed_job_active_record-4.1.2-tests.tgz /delayed_job_active_record-4.1.2.gem +/delayed_job_active_record-4.1.3-tests.tgz +/delayed_job_active_record-4.1.3.gem diff --git a/rubygem-delayed_job_active_record.spec b/rubygem-delayed_job_active_record.spec index 39cb8d4..0af5062 100644 --- a/rubygem-delayed_job_active_record.spec +++ b/rubygem-delayed_job_active_record.spec @@ -2,14 +2,14 @@ %global gem_name delayed_job_active_record Name: rubygem-%{gem_name} -Version: 4.1.2 -Release: 4%{?dist} +Version: 4.1.3 +Release: 1%{?dist} Summary: ActiveRecord back-end for DelayedJob License: MIT URL: http://github.com/collectiveidea/delayed_job_active_record Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # git clone https://github.com/collectiveidea/delayed_job_active_record.git && cd delayed_job_active_record -# git checkout v4.1.2 && tar czvf delayed_job_active_record-4.1.2-tests.tgz ./spec +# git checkout v4.1.3 && tar czvf delayed_job_active_record-4.1.3-tests.tgz ./spec Source1: delayed_job_active_record-%{version}-tests.tgz BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -19,7 +19,6 @@ BuildRequires: rubygem(activerecord) >= 3.0 # The test suite needs sample_jobs from delayed_job # https://github.com/collectiveidea/delayed_job_active_record/issues/18 BuildRequires: rubygem-delayed_job-doc >= 3.0 -BuildRequires: rubygem-delayed_job-doc < 5 BuildRequires: rubygem(sqlite3) BuildArch: noarch @@ -36,10 +35,15 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -c -T -%gem_install -n %{SOURCE0} +%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}-%{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 +%gem_install %install mkdir -p %{buildroot}%{gem_dir} @@ -48,16 +52,15 @@ cp -a .%{gem_dir}/* \ %check pushd .%{gem_instdir} -tar xf %{SOURCE1} +# Move test into the place. +ln -s %{_builddir}/spec spec # We do not care about test coverage. -sed -i "1,12 s/^/#/" spec/helper.rb +sed -i "1,14 s/^/#/" spec/helper.rb rspec spec popd - - %files %dir %{gem_instdir} %license %{gem_instdir}/LICENSE.md @@ -67,11 +70,14 @@ popd %files doc %doc %{gem_docdir} -%{gem_instdir}/delayed_job_active_record.gemspec %doc %{gem_instdir}/CONTRIBUTING.md %doc %{gem_instdir}/README.md +%{gem_instdir}/delayed_job_active_record.gemspec %changelog +* Thu Oct 04 2018 Vít Ondruch - 4.1.3-1 +- Update to delayed_job_active_record 4.1.3. + * Sat Jul 14 2018 Fedora Release Engineering - 4.1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index e15d905..17d9178 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (delayed_job_active_record-4.1.2-tests.tgz) = c66ea9c0335dc2391aacc6cb24fa4cee363eea99d930c0a71a516355c2b2c2ebadc40f8a48d00e26af7dcc26eb1aacc08ac3c71017222a1cf5051da240fe7c50 -SHA512 (delayed_job_active_record-4.1.2.gem) = 0e4058867953727ce29bd53fd14e5094c4e2cf858a81f852b16e154af38f34645625bc9ddc66d9f4cc2815bc58767037b30f569e7d7b229ad2d8954af6c89b6d +SHA512 (delayed_job_active_record-4.1.3-tests.tgz) = 6a7e2bb5a4e0466b18abc4cdd98ae32f696a51b132b3b8dc30b54eabcfdb7e8a91a5f53afc8762749932dbbe32c0449d024f7f5e52c7db9d5c19502e03c311d3 +SHA512 (delayed_job_active_record-4.1.3.gem) = 8318a242b9c6e4fdb241ce497c9bb61b9c4df284c2355b72eb6e2553936160a54a128ad38b697042e6dd86a6bc3e7eafecda0e7f1b7589a995b2f8ab446ef861