From 06154b835e8e227f6806949e12e3d188226470c8 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Aug 07 2020 08:58:39 +0000 Subject: Update to prawn 2.3.0 also enhance .spec file. Resolves: rhbz#1862713 --- diff --git a/.gitignore b/.gitignore index 9f06374..4943b75 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /prawn-*.gem +/prawn-*-data.txz diff --git a/rubygem-prawn.spec b/rubygem-prawn.spec index 4842b78..1269f68 100644 --- a/rubygem-prawn.spec +++ b/rubygem-prawn.spec @@ -2,22 +2,26 @@ Summary: A fast and nimble PDF generator for Ruby Name: rubygem-%{gem_name} -Version: 2.2.2 -Release: 5%{?dist} +Version: 2.3.0 +Release: 1%{?dist} # afm files are licensed by APAFML, the rest of package is GPLv2 or GPLv3 or Ruby License: (GPLv2 or GPLv3 or Ruby) and APAFML URL: http://prawnpdf.org -Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -# Patch ruby.rb to fix errors due to updated pdf-core dependencies -# https://github.com/prawnpdf/prawn/commit/c504ae4e683017d7afadece084734a9190230cd8 -Patch0: prawn-fix-test-errors.patch +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +# Not all of data is shipped, but it's needed for the test suite. +# You may check it like so: +# git clone --no-checkout https://github.com/prawnpdf/prawn.git +# cd prawn && git archive -v -o prawn-2.3.0-data.txz 2.3.0 data +Source1: %{gem_name}-%{version}-data.txz +BuildRequires: ruby BuildRequires: ruby(release) BuildRequires: rubygems-devel >= 1.3.6 BuildRequires: rubygem(rspec) >= 3.0 -BuildRequires: rubygem(ttfunk) >= 1.5 +BuildRequires: rubygem(ttfunk) >= 1.6 BuildRequires: rubygem(pdf-reader) >= 1.4.0 BuildRequires: rubygem(pdf-inspector) >= 1.2.1 -BuildRequires: rubygem(pdf-core) >= 0.7.0 +BuildRequires: rubygem(pdf-core) >= 0.8.1 +BuildRequires: rubygem(bigdecimal) BuildArch: noarch %description @@ -54,15 +58,12 @@ BuildArch: noarch Documentation for %{name} %prep -%setup -q -n %{gem_name}-%{version} -%gemspec_remove_dep -g pdf-core "~> 0.7.0" -%gemspec_add_dep -g pdf-core ">= 0.7.0" -%patch0 +%setup -q -n %{gem_name}-%{version} -b1 %build gem build ../%{gem_name}-%{version}.gemspec -%gem_install -n %{gem_name}-%{version}.gem +%gem_install %install mkdir -p %{buildroot}%{gem_dir} @@ -71,14 +72,18 @@ cp -a .%{gem_dir}/* \ %check pushd .%{gem_instdir} +rm -rf data +ln -s %{_builddir}/data . + sed -i "/^require 'bundler'/d" ./spec/spec_helper.rb sed -i "/^Bundler.setup/d" ./spec/spec_helper.rb +# manual_builder dependency is not in Fedora yet +mv spec/prawn_manual_spec.rb{,.disable} + # There are missing font and image files required by test suite. # These are not bundled in the gem therefore some failures occur. -rspec spec \ - | tee /dev/stderr \ - | grep '850 examples, 103 failures' +rspec spec popd %files @@ -86,12 +91,8 @@ popd %{gem_libdir} %exclude %{gem_cache} %{gem_spec} -%doc %{gem_instdir}/LICENSE -%doc %{gem_instdir}/COPYING -%doc %{gem_instdir}/GPLv2 -%doc %{gem_instdir}/GPLv3 +%license %{gem_instdir}/{LICENSE,COPYING,GPLv2,GPLv3} %exclude %{gem_instdir}/%{gem_name}.gemspec -%doc %{gem_instdir}/data/fonts/MustRead.html %{gem_instdir}/data/fonts/*.afm %exclude %{gem_instdir}/.yardopts @@ -101,8 +102,13 @@ popd %{gem_instdir}/Rakefile %{gem_instdir}/spec %doc %{gem_instdir}/manual +%doc %{gem_instdir}/data/fonts/MustRead.html %changelog +* Mon Aug 03 06:49:08 GMT 2020 Pavel Valena - 2.3.0-1 +- Update to prawn 2.3.0. + Resolves: rhbz#1862713 + * Wed Jul 29 2020 Fedora Release Engineering - 2.2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 8d3741a..43c4b51 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (prawn-2.2.2.gem) = 59c1fab27099decbbe7eb2b954069131ccdea2c92cdbdac8227fe1036fb9f0af6d2d377777b9c9ab9fff75491f9967b7f169fde66b2a0b3db1a9b4b1ef1104f1 +SHA512 (prawn-2.3.0.gem) = de830e1aaddc4ab382495516d503f433063a883cef6066ddbe9c6f670a51132979e33fa7860d7d3b32e1f1cd4f2ec118af7dfa5d13f5b79cfdd12f7e10e27b15 +SHA512 (prawn-2.3.0-data.txz) = 73a6c351b12f9b5a30cba684cf97c573f5e1bf9fd8935afc28804b552989ca79dded71828bcf72b85db1529e05fd408b9e75cb8df267d393fb48bfc71bdd3364