diff --git a/.gitignore b/.gitignore index c92bc26..9f06374 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ -/prawn-1.0.0.rc2.gem -/prawn-1.0.0.gem -/rubygem-prawn-missing-test-fonts.tar -/prawn-1.2.1.gem -/prawn-2.0.1.gem -/prawn-2.0.2.gem -/prawn-2.1.0.gem +/prawn-*.gem diff --git a/prawn-fix-test-errors.patch b/prawn-fix-test-errors.patch new file mode 100644 index 0000000..5c47575 --- /dev/null +++ b/prawn-fix-test-errors.patch @@ -0,0 +1,11 @@ +--- lib/prawn/font.rb.orig 2018-11-08 20:45:32.309671191 +0000 ++++ lib/prawn/font.rb 2018-11-08 20:46:17.537133702 +0000 +@@ -384,7 +384,7 @@ + end + + def identifier_for(subset) #:nodoc: +- "#{@identifier}.#{subset}" ++ "#{@identifier}.#{subset}".to_sym + end + + def inspect #:nodoc: diff --git a/rubygem-prawn.spec b/rubygem-prawn.spec index c6c899e..a109358 100644 --- a/rubygem-prawn.spec +++ b/rubygem-prawn.spec @@ -2,20 +2,22 @@ Summary: A fast and nimble PDF generator for Ruby Name: rubygem-%{gem_name} -Version: 2.1.0 -Release: 6%{?dist} -Group: Development/Languages +Version: 2.2.2 +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://prawn.majesticseacreature.com -Source0: http://rubygems.org/gems/%{gem_name}-%{version}%{?prever}.gem +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 BuildRequires: ruby(release) BuildRequires: rubygems-devel >= 1.3.6 -BuildRequires: rubygem(rspec) -BuildRequires: rubygem(ttfunk) >= 1.4 -BuildRequires: rubygem(pdf-reader) >= 1.2.0 -BuildRequires: rubygem(pdf-inspector) >= 1.2.0 -BuildRequires: rubygem(pdf-core) >= 0.6.0 +BuildRequires: rubygem(rspec) >= 3.0 +BuildRequires: rubygem(ttfunk) >= 1.5 +BuildRequires: rubygem(pdf-reader) >= 1.4.0 +BuildRequires: rubygem(pdf-inspector) >= 1.2.1 +BuildRequires: rubygem(pdf-core) >= 0.7.0 BuildArch: noarch %description @@ -45,7 +47,6 @@ Here are some of the important features we provide: %package doc Summary: Documentation for %{name} -Group: Documentation Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -53,14 +54,15 @@ BuildArch: noarch Documentation for %{name} %prep -gem unpack %{SOURCE0} -%setup -q -D -T -n %{gem_name}-%{version}%{?prever} -gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec +%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 %build -gem build %{gem_name}.gemspec +gem build ../%{gem_name}-%{version}.gemspec -%gem_install -n %{gem_name}-%{version}%{?prever}.gem +%gem_install -n %{gem_name}-%{version}.gem %install mkdir -p %{buildroot}%{gem_dir} @@ -69,13 +71,14 @@ cp -a .%{gem_dir}/* \ %check pushd .%{gem_instdir} -sed -i '/^require "bundler"/d' ./spec/spec_helper.rb -sed -i '/^Bundler.setup/d' ./spec/spec_helper.rb +sed -i "/^require 'bundler'/d" ./spec/spec_helper.rb +sed -i "/^Bundler.setup/d" ./spec/spec_helper.rb -# There are missing font files required by test suite. +# 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 '837 examples, 47 failures, 4 pending' + | grep '850 examples, 103 failures' popd %files @@ -98,11 +101,11 @@ popd %{gem_instdir}/Rakefile %{gem_instdir}/spec %doc %{gem_instdir}/manual -%{gem_instdir}/data/pdfs -%{gem_instdir}/data/images -%{gem_instdir}/data/*.txt %changelog +* Thu Nov 08 2018 Christopher Brown - 2.2.2-1 +- Update to 2.2.2 + * Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 9687e51..8d3741a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a085694ca0100d939020d27f16a6c86b prawn-2.1.0.gem +SHA512 (prawn-2.2.2.gem) = 59c1fab27099decbbe7eb2b954069131ccdea2c92cdbdac8227fe1036fb9f0af6d2d377777b9c9ab9fff75491f9967b7f169fde66b2a0b3db1a9b4b1ef1104f1