#1 Update to Gherkin 5.1.0.
Merged 4 months ago by vondruch. Opened 4 months ago by jackorp.
rpms/ jackorp/rubygem-gherkin master  into  master

file modified
+2

@@ -10,3 +10,5 @@ 

  /gherkin-4.0.0-testdata.tgz

  /gherkin-4.0.0.gem

  /gherkin-4.1.3.gem

+ /gherkin-5.1.0.gem

+ /rubygem-gherkin-5.1.0-make.tar.gz

file modified
+24 -20

@@ -1,13 +1,15 @@ 

  %global gem_name gherkin

  

  Name: rubygem-%{gem_name}

- Version: 4.1.3

- Release: 4%{?dist}

+ Version: 5.1.0

+ Release: 1%{?dist}

  Summary: Fast Gherkin lexer/parser

- Group: Development/Languages

  License: MIT

  URL: https://github.com/cucumber/gherkin-ruby

  Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem

+ # git clone https://github.com/cucumber/gherkin-ruby && cd gherkin-ruby

+ # git checkout v5.1.0 && tar czvf rubygem-gherkin-5.1.0-make.tar.gz Makefile testdata/ bin/gherkin-generate-tokens

+ Source1: %{name}-%{version}-make.tar.gz

  BuildRequires: ruby(release)

  BuildRequires: rubygems-devel

  BuildRequires: ruby

@@ -21,7 +23,6 @@ 

  

  %package doc

  Summary: Documentation for %{name}

- Group: Documentation

  Requires: %{name} = %{version}-%{release}

  BuildArch: noarch

  

@@ -30,10 +31,15 @@ 

  

  

  %prep

- %setup -n %{name}-%{version} -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}

@@ -41,7 +47,7 @@ 

          %{buildroot}%{gem_dir}/

  

  mkdir -p %{buildroot}%{_bindir}

- cp -pa .%{_bindir}/* \

+ cp -a .%{_bindir}/* \

          %{buildroot}%{_bindir}/

  

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

@@ -51,18 +57,23 @@ 

  %check

  pushd .%{gem_instdir}

  

- LANG=C.UTF-8 rspec spec

+ rspec spec

+ 

+ # Files needed for make to pass.

+ ln -s %{_builddir}/Makefile ./Makefile

+ ln -s %{_builddir}/testdata ./testdata

+ ln -s %{_builddir}/bin/gherkin-generate-tokens ./bin/gherkin-generate-tokens

  

  sed -i '/.built:/ i .built:\n' Makefile

  sed -i '/.built: /,/^$/ s/^/#/' Makefile

  

- LANG=C.UTF-8 make .compared

+ make .compared

  popd

  

  %files

  %dir %{gem_instdir}

  %{_bindir}/gherkin-ruby

- %exclude %{gem_instdir}/.*

+ %{_bindir}/gherkin

  %license %{gem_instdir}/LICENSE

  %{gem_instdir}/bin

  %{gem_libdir}

@@ -71,20 +82,13 @@ 

  

  %files doc

  %doc %{gem_docdir}

- %doc %{gem_instdir}/CONTRIBUTING.md

- %{gem_instdir}/Gemfile

- %{gem_instdir}/Makefile

  %doc %{gem_instdir}/README.md

- %{gem_instdir}/Rakefile

- %{gem_instdir}/berp

- %{gem_instdir}/gherkin.gemspec

- %{gem_instdir}/gherkin-languages.json

- %{gem_instdir}/gherkin-ruby.razor

- %{gem_instdir}/gherkin.berp

  %{gem_instdir}/spec

- %{gem_instdir}/testdata

  

  %changelog

+ * Mon Sep 03 2018 Jaroslav Prokop <jar.prokop@volny.cz> - 5.1.0-1

+ - Update to Gherkin 5.1.0.

+ 

  * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.3-4

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

  

file modified
+2 -1

@@ -1,1 +1,2 @@ 

- SHA512 (gherkin-4.1.3.gem) = 7c113172ddf38ccf7e49eaac19355f3cb991f69d7499dba9189f375b75d3614f349fc6374e584a92c1223b0708cc8944859b4b38e28d79779a5091fa0c775e6e

+ SHA512 (gherkin-5.1.0.gem) = d935ccceaec493736f337a4c3db69909858d15f4c41e93ecfc6ca31a30fc48eec1cecbe71d455265e1062006f49f05461c9860c9b3cc4806bb25f42dec6f504e

+ SHA512 (rubygem-gherkin-5.1.0-make.tar.gz) = 9e6d549e8dab86f8d71f1ef55c7d7bfbc01ed5f666de2d2ffafda2a4757b32212434bca4847e79a5652ea5c60289f97d6323a20823ca508b3c2bcb74b0063ee0

Checks:

  • Tests: ok
  • gem compare: ok
  • rpmlint: W: no-manual-page-for-binary gherkin, gherkin-ruby - would you mind adding it? (Example)
  • Dependent packages: Q: Have you tried rebuilding rubygem-cucumber and rubygem-cucumber-core with upgraded gherkin?

rpmlint: W: no-manual-page-for-binary gherkin, gherkin-ruby - would you mind adding it? (Example)

Ok, I'll check it out no problem.

Dependent packages: Q: Have you tried rebuilding rubygem-cucumber and rubygem-cucumber-core with upgraded gherkin?

5.1.0 is actually the required version, so I haven't tried yet, but I'll do it.

rebased onto 0c33948

4 months ago

Thinking.. are the man pages even necessary in package like this? It's only a few lines that do not say very much.

You are right that the generated man pages are not really useful and that is because the command line tool itself is not really well documented.

So how about proceeding with this PR without man pages ATM, but at the same time opening upstream PR/ticket improving the executable itself to provide at least basic information, because there is not even mentioned, that on top of the options the executable accepts file parameter.

https://github.com/cucumber/cucumber/tree/master/gherkin#cli

2 new commits added

  • Comment out man pages creation.
  • Create symlink instead of generating same man page twice.
4 months ago

rebased onto 0d01952

4 months ago

Since gherkin executable does not contain much meaningful info about usage, it has been split into different PR until the documentation will reach state we are happy to add into Fedora.

Current PR should be ready for merging.

Pull-Request has been merged by vondruch

4 months ago