diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec
index 4111dd9..2aa9afb 100644
--- a/rubygem-aruba.spec
+++ b/rubygem-aruba.spec
@@ -1,75 +1,82 @@
 # Generated from aruba-0.4.11.gem by gem2rpm -*- rpm-spec -*-
-%global gem_name aruba
+%global     gem_name    aruba
+
+Summary:    CLI Steps for Cucumber, hand-crafted for you in Aruba
+Name:       rubygem-%{gem_name}
+Version:    0.14.14
+Release:    7%{?dist}
 
-Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba
-Name: rubygem-%{gem_name}
-Version: 0.14.14
-Release: 7%{?dist}
 # aruba itself is MIT
 # icons in templates/images are CC-BY
 # jquery.js itself is MIT or GPLv2
 # jquery.js includes sizzle.js, which is MIT or BSD or GPLv2
-License: MIT and CC-BY and (MIT or GPLv2) and (MIT or BSD or GPLv2)
-URL: http://github.com/cucumber/aruba
-Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-BuildRequires: ruby(release)
-BuildRequires: rubygems-devel
-BuildRequires: ruby
-BuildRequires: rubygem(cucumber) >= 1.3.19
-BuildRequires: rubygem(childprocess) >= 0.5.6
-BuildRequires: rubygem(ffi) >= 1.9.10
-BuildRequires: rubygem(minitest)
-BuildRequires: rubygem(pry)
-BuildRequires: rubygem(rspec) >= 3
-BuildRequires: rubygem(contracts) >= 0.9
-BuildRequires: rubygem(thor) >= 0.19
-BuildRequires: rubygem(irb)
+License:        MIT and CC-BY and (MIT or GPLv2) and (MIT or BSD or GPLv2)
+URL:            http://github.com/cucumber/aruba
+Source0:        http://rubygems.org/gems/%{gem_name}-%{version}.gem
+
+BuildRequires:  ruby(release)
+BuildRequires:  rubygems-devel
+BuildRequires:  ruby
+# For %%check
+BuildRequires:  rubygem(cucumber) >= 1.3.19
+BuildRequires:  rubygem(childprocess) >= 0.5.6
+BuildRequires:  rubygem(ffi) >= 1.9.10
+BuildRequires:  rubygem(minitest)
+BuildRequires:  rubygem(pry)
+BuildRequires:  rubygem(rspec) >= 3
+BuildRequires:  rubygem(contracts) >= 0.9
+BuildRequires:  rubygem(thor) >= 0.19
+BuildRequires:  rubygem(irb)
 # features/steps/command/shell.feature:97 # Scenario: Running python commands
-BuildRequires: /usr/bin/python3
-BuildArch: noarch
+BuildRequires:  %{_bindir}/python3
+
+BuildArch:      noarch
 
 %description
 Aruba is Cucumber extension for Command line applications written
 in any programming language.
 
 
-%package doc
-Summary: Documentation for %{name}
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
+%package        doc
+Summary:        Documentation for %{name}
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description doc
 Documentation for %{name}
 
 %prep
 %setup -q -n %{gem_name}-%{version}
+mv ../%{gem_name}-%{version}.gemspec .
 
-%gemspec_remove_dep -g childprocess '>= 0.6.3'
+# Relax childprocess dependency
+%gemspec_remove_dep -g childprocess '>= 0.6.3' -s %{gem_name}-%{version}.gemspec
 
 %build
-gem build ../%{gem_name}-%{version}.gemspec
+gem build %{gem_name}-%{version}.gemspec
 %gem_install
 
-
 %install
 mkdir -p %{buildroot}%{gem_dir}
 cp -a .%{gem_dir}/* \
-        %{buildroot}%{gem_dir}/
+    %{buildroot}%{gem_dir}/
 
 rm -f %{buildroot}%{gem_cache}
 pushd %{buildroot}%{gem_instdir}
 rm -rf \
-	.[^.]* \
-	Gemfile \
-	Rakefile \
-	appveyor.yml \
-	%{gem_name}.gemspec \
-	cucumber.yml \
-	config/ \
-	fixtures/ \
-	spec/ \
-	script/ \
-	%{nil}
+    .[^.]* \
+    Gemfile \
+    Rakefile \
+    appveyor.yml \
+    %{gem_name}.gemspec \
+    cucumber.yml \
+    config/ \
+    features/ \
+    fixtures/ \
+    spec/ \
+    script/ \
+    %{nil}
+popd
 
 %check
 pushd .%{gem_instdir}
@@ -79,31 +86,32 @@ rm .rspec
 # We don't care about code coverage.
 # We don't need Bundler.
 sed -i spec/spec_helper.rb \
-	-e '\@[sS]imple[Cc]ov@d' \
-	-e '\@[Bb]undler@d' \
-	%{nil}
+    -e '\@[sS]imple[Cc]ov@d' \
+    -e '\@[Bb]undler@d' \
+    %{nil}
 
-RUBYOPT=-rtime rspec spec
+env RUBYOPT=-rtime \
+    rspec spec
 
 # We don't care about code coverage.
 sed -i features/support/env.rb \
-	-e '\@require.*simplecov@d'
+    -e '\@require.*simplecov@d'
 > features/support/simplecov_setup.rb
 
 # Let the test cli-app find Aruba.
 sed -i fixtures/cli-app/spec/spec_helper.rb \
-	-e "\@\$LOAD_PATH@s|\.\./\.\./lib|$(pwd)/lib|"
+    -e "\@\$LOAD_PATH@s|\.\./\.\./lib|$(pwd)/lib|"
 
 # /usr/bin/python is reporting deprecation warning :/
 # No need to modify @requires-python (in run_commands.feature and hooks.rb)
 if ! grep -q python3 features/steps/command/shell.feature
 then
-	sed -i features/03_testing_frameworks/cucumber/steps/command/run_commands_which_require_a_shell.feature \
-		-e 's|python|python3|'
-	sed -i lib/aruba/generators/script_file.rb  \
-		-e '\@interpreter@s|A-Z|A-Z0-9|'
-	sed -i features/01_getting_started_with_aruba/run_commands.feature \
-		-e '\@[^-]python@s|python|python3|'
+    sed -i features/03_testing_frameworks/cucumber/steps/command/run_commands_which_require_a_shell.feature \
+        -e 's|python|python3|'
+    sed -i lib/aruba/generators/script_file.rb  \
+        -e '\@interpreter@s|A-Z|A-Z0-9|'
+    sed -i features/01_getting_started_with_aruba/run_commands.feature \
+        -e '\@[^-]python@s|python|python3|'
 fi
 
 # The following test fails on ppc64le, due to different block size
@@ -112,19 +120,20 @@ mv features/04_aruba_api/filesystem/report_disk_usage.feature{,.skip}
 
 # Get rid of Bundler
 sed -i Rakefile \
-	-e '\@[Bb]undler@d' \
-	-e 's|bundle exec ||' \
-	%{nil}
+    -e '\@[Bb]undler@d' \
+    -e 's|bundle exec ||' \
+    %{nil}
 
 # Adjust test cases referring to $HOME.
 sed -i features/04_aruba_api/core/expand_path.feature -e "s|/home/\[\^/\]+|$(echo $HOME)|" 
 sed -i features/02_configure_aruba/home_directory.feature \
-	-e "\@Scenario: Default value@,\@Scenario@s|/home/|$(echo $HOME)|"
+    -e "\@Scenario: Default value@,\@Scenario@s|/home/|$(echo $HOME)|"
 sed -i features/02_configure_aruba/home_directory.feature \
-	-e "\@Set to aruba's working directory@,\@Scenario@s|/home/|$(echo $HOME)/|"
+    -e "\@Set to aruba's working directory@,\@Scenario@s|/home/|$(echo $HOME)/|"
 
 # Make the Aruba always awailable.
-RUBYOPT=-I$(pwd)/lib cucumber
+env RUBYOPT=-I$(pwd)/lib \
+    cucumber
 
 # Go back the skipped test
 mv features/04_aruba_api/filesystem/report_disk_usage.feature{.skip,}
@@ -133,21 +142,20 @@ popd
 
 
 %files
-%dir %{gem_instdir}
-%license %{gem_instdir}/LICENSE
-%doc %{gem_instdir}/README.md
+%dir        %{gem_instdir}
+%license    %{gem_instdir}/LICENSE
+%doc        %{gem_instdir}/README.md
+
 %{gem_libdir}
 %{gem_instdir}/bin/
-%exclude %{gem_instdir}/config
 %{gem_spec}
 
 %files doc
-%doc %{gem_docdir}
-%doc %{gem_instdir}/CONTRIBUTING.md
-%doc %{gem_instdir}/CHANGELOG.md
-%doc %{gem_instdir}/TODO.md
+%doc    %{gem_docdir}
+%doc    %{gem_instdir}/CONTRIBUTING.md
+%doc    %{gem_instdir}/CHANGELOG.md
+%doc    %{gem_instdir}/TODO.md
 %{gem_instdir}/doc/
-%{gem_instdir}/features/
 %{gem_instdir}/templates/
 
 %changelog