[rubygem-simple_form/f21] Update to 3.1.0.rc2

[Josef Stribny]

commit a89bac69c73ee47822baaf64fa93851b5fc66cc6
Author: Josef Stribny <jstribny at redhat.com>
Date:   Thu Oct 9 08:54:47 2014 +0200

    Update to 3.1.0.rc2

 .gitignore               |    1 +
 rubygem-simple_form.spec |   34 +++++++++++++++++-----------------
 sources                  |    2 +-
 3 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d7cf41c..8ecb012 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /simple_form-2.0.3.gem
 /simple_form-3.0.0.rc.gem
+/simple_form-3.1.0.rc2.gem
diff --git a/rubygem-simple_form.spec b/rubygem-simple_form.spec
index 3487c18..170fc0c 100644
--- a/rubygem-simple_form.spec
+++ b/rubygem-simple_form.spec
@@ -1,39 +1,34 @@
 %global gem_name simple_form
 
-%global mainver 3.0.0
+%global mainver 3.1.0
 %global prever .rc
-%global release 2
+%global prerelease 2
 %{?prever:
-%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{mainver}%{?prever}
-%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}
-%global gem_cache %{gem_dir}/cache/%{gem_name}-%{mainver}%{?prever}.gem
-%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{mainver}%{?prever}.gemspec
+%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{mainver}%{?prever}%{?prerelease}
+%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}%{?prerelease}
+%global gem_cache %{gem_dir}/cache/%{gem_name}-%{mainver}%{?prever}%{?prerelease}.gem
+%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{mainver}%{?prever}%{?prerelease}.gemspec
 }
 
 Name: rubygem-%{gem_name}
 Version: %{mainver}
-Release: %{?prever:0.}%{release}%{?prever}%{?dist}.1
+Release: %{?prever:0.}1%{?prever}%{?prerelease}%{?dist}
 Summary: Flexible and powerful components to create forms
 
 Group: Development/Languages
 License: MIT
 URL: https://github.com/plataformatec/%{gem_name}
-Source0: http://rubygems.org/downloads/%{gem_name}-%{version}%{?prever}.gem
+Source0: http://rubygems.org/downloads/%{gem_name}-%{version}%{?prever}%{?prerelease}.gem
 
 Provides: rubygem(%{gem_name}) = %{version}
 BuildArch: noarch
 BuildRequires: rubygems-devel
 # Test suite needs the following dependencies
 BuildRequires: rubygem(mocha)
-BuildRequires: rubygem(minitest)
+BuildRequires: rubygem(minitest) >= 5.0
 BuildRequires: rubygem(railties)
+BuildRequires: rubygem(activemodel)
 BuildRequires: rubygem(tzinfo)
-Requires: ruby(release)
-Requires: rubygems
-Requires: rubygem(activemodel) >= 4.0
-Requires: rubygem(activemodel) < 4.1
-Requires: rubygem(actionpack) >= 4.0
-Requires: rubygem(actionpack) < 4.1
 
 
 %description
@@ -54,7 +49,7 @@ This package contains documentation %{name}
 
 %prep
 gem unpack %{SOURCE0}
-%setup -q -D -T -n  %{gem_name}-%{version}%{?prever}
+%setup -q -D -T -n  %{gem_name}-%{version}%{?prever}%{?prerelease}
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
 
@@ -75,6 +70,7 @@ cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
 
 
 %check
+pushd ./%{gem_instdir}
 # Get rid of Bundler.
 sed -i "/require 'bundler\/setup'/d" test/test_helper.rb
 # The following test cases require rubygem-country_select which is not packaged
@@ -83,7 +79,8 @@ sed -i "/require 'country_select'/d" test/test_helper.rb
 sed -i '121,124 s|^|#|' test/form_builder/general_test.rb
 sed -i '5,17 s|^|#|' test/inputs/priority_input_test.rb
 sed -i '38,48 s|^|#|' test/inputs/priority_input_test.rb
-find ./test -name *_test.rb | xargs testrb -Itest
+ruby -Ilib:test -e 'Dir.glob "./test/*_test.rb", &method(:require)'
+popd
 
 
 %files
@@ -102,6 +99,9 @@ find ./test -name *_test.rb | xargs testrb -Itest
 
 
 %changelog
+* Wed Oct 08 2014 Josef Stribny <jstribny at redhat.com> - 3.1.0-0.1.rc2
+- Update to 3.1.0.rc2
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-0.2.rc.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index cfd379b..f6c72a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dfe9268f4cfc8c77ab8ee63927a20eba  simple_form-3.0.0.rc.gem
+9fd0266548df94e5c39dddf04c4b9503  simple_form-3.1.0.rc2.gem