#6 Fix FTI issue on Rawhide
Merged a year ago by snecker. Opened a year ago by vondruch.
rpms/ vondruch/rubygem-asciidoctor-pdf fix-FTI  into  master

file modified
+45 -24
@@ -1,7 +1,9 @@ 

  %global gem_name asciidoctor-pdf

  %global mainver 1.5.0

  %global prerelease .beta.6

- %global release 11

+ %global release 12

+ 

+ %bcond_with network

  

  Name: rubygem-%{gem_name}

  Version: %{mainver}
@@ -17,22 +19,20 @@ 

  BuildRequires: ruby(release)

  BuildRequires: rubygems-devel > 1.3.1

  BuildRequires: ruby >= 1.9

- BuildRequires: rubygem-rspec

- BuildRequires: asciidoctor

- BuildRequires: rubygem-prawn

- BuildRequires: rubygem-prawn-svg

- BuildRequires: rubygem-prawn-table

- BuildRequires: rubygem-prawn-templates

- BuildRequires: rubygem-prawn-icon

- BuildRequires: rubygem-treetop

- BuildRequires: rubygem-concurrent-ruby

- BuildRequires: rubygem-safe_yaml

- BuildRequires: rubygem-chunky_png

- BuildRequires: rubygem-pdf-inspector

- BuildRequires: rubygem-rouge

- BuildRequires: rubygem-thread_safe

- BuildRequires: rubygem-coderay

- BuildRequires: rubygem-bundler

+ BuildRequires: rubygem(rspec)

+ BuildRequires: rubygem(asciidoctor)

+ BuildRequires: rubygem(prawn)

+ BuildRequires: rubygem(prawn-svg)

+ BuildRequires: rubygem(prawn-table)

+ BuildRequires: rubygem(prawn-templates)

+ BuildRequires: rubygem(prawn-icon)

+ BuildRequires: rubygem(treetop)

+ BuildRequires: rubygem(concurrent-ruby)

+ BuildRequires: rubygem(safe_yaml)

+ BuildRequires: rubygem(chunky_png)

+ BuildRequires: rubygem(pdf-inspector)

+ BuildRequires: rubygem(rouge)

+ BuildRequires: rubygem(coderay)

  

  BuildArch: noarch

  
@@ -51,13 +51,11 @@ 

  %prep

  %setup -q -n %{gem_name}-%{version}%{?prerelease} -b 1

  

- %check

- pushd .%{gem_instdir}

- tar xf %{SOURCE1}

- rspec spec \

-   | tee /dev/stderr \

-   | grep '639 examples, 16 failures'

- popd

+ # Regenerate the parser.

+ tt lib/asciidoctor/pdf/formatted_text/parser.treetop

+ 

+ %gemspec_remove_dep -g treetop '~> 1.5.0'

+ %gemspec_add_dep -g treetop '~> 1.5'

  

  %build

  gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec
@@ -73,6 +71,25 @@ 

  

  find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x

  

+ %check

+ pushd .%{gem_instdir}

+ cp -a %{_builddir}/{spec,examples} .

+ 

+ %if ! %{with network}

+ # These tests require network connectivity.

+ sed -i "/it 'should read remote image if allow-uri-read is set' do/a\\

+       skip" spec/image_spec.rb

+ sed -i "/it 'should use image format specified by format attribute' do/a\\

+       skip" spec/image_spec.rb

+ sed -i "/video_id = '77477140'/i\\

+       skip" spec/video_spec.rb

+ %endif

+ 

+ rspec spec \

+   | tee /dev/stderr \

+   | grep '639 examples, 13 failures'

+ popd

+ 

  %files

  %dir %{gem_instdir}

  %{_bindir}/%{gem_name}
@@ -93,6 +110,10 @@ 

  %{gem_instdir}/%{gem_name}.gemspec

  

  %changelog

+ * Tue Oct 29 2019 Vít Ondruch <vondruch@redhat.com> - 1.5.0-0.12.beta.6

+ - Disable network depending tests.

+ - Relax Treetop dependency.

+ 

  * Sat Oct 19 2019 Christopher Brown <chris.brown@redhat.com> - 1.5.0-0.11.beta.6

  - Update to 1.5.0.beta.6

  - Enable test suite

Relax the Treetop dependnecy to fix the installation issues on Rawhide + some minor tweaks.

I split the changes into smaller chunks, so feel free to cherry pick if you disagree with some changes.

Please note that F31 very likely needs the Treetop change to fix the installation issues.

Pull-Request has been merged by snecker

a year ago