Tests need to be launched under bundler.

diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index c0d47ea..4fc6fd4 100644 (file)
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -28,8 +28,10 @@ BuildRequires:  ruby(release) >= 1.9.3
 BuildRequires:  rubygems-devel
 BuildRequires:  rubygem(rdoc)
 # for tests (all runtimes also needed)
-#BuildRequires:  rubygem(rspec)
-#BuildRequires:  rubygem(rspec-rails)
+# TODO: more dependencies (some guard-*, ...)
+#BuildRequires:  rubygem(bunder)
+#BuildRequires:  rubygem(rspec) < 3
+#BuildRequires:  rubygem(rspec-rails) < 3
 Requires(pre):  shadow-utils
 Requires(post): policycoreutils-python
 Requires(preun): policycoreutils-python
@@ -41,26 +43,16 @@ Requires:       mod_ssl
 Requires:       rubygem(dalli)
 Requires:       rubygem(hashie)
 Requires:       rubygem(ice_nine)
-# upstream: jbuilder ~> 2.1.0
-# F20: 1.5.0
 Requires:       rubygem(jbuilder)
 Requires:       rubygem(kgio)
 Requires:       rubygem(logstasher)
-# upstream: ~> 4.0.48
-# F20: 4.0.18
 Requires:       rubygem(passenger)
-# upstream: rails ~> 4.0.8
-# F20: 4.0.0, F21: 4.1.x
 Requires:       rubygem(rails) >= 4.0.0
 Requires:       rubygem(rails) <= 4.1
-# upstream: rails-api ~> 0.2.0, F20: 0.1.0
 Requires:       rubygem(rails-api)
-# COPR
 Requires:       rubygem(occi-core) >= 4.2.16
 Requires:       rubygem(occi-core) < 4.3
 Requires:       rubygem(rack-cors)
-# upstream: >= 1.2.3, really needed
-# F20: 1.2.0
 Requires:       rubygem(warden) >= 1.2.3
 %if 0%{?fedora} && 0%{?fedora} <= 20 || 0%{?rhel} && 0%{?rhel} <= 7
 Requires:       ruby(release)
@@ -190,10 +182,28 @@ echo "Listen 11443" >>  %{buildroot}%{_sysconfdir}/httpd/conf.d/occi-listen.conf
 install -p -m 0644 examples/etc/apache2/conf.d/security %{buildroot}%{_sysconfdir}/httpd/conf.d/occi-security.conf
 
 
-# Upstream testsuite fails:
-#254 examples, 29 failures, 13 pending
 #%%check
-#rspec -Ilib spec --require spec_helper
+## upstream: rails ~> 4.0.8
+## F20: 4.0.0, F21: 4.1.x
+#sed -i "s/\(gem 'rails'\).*/\1, >= 4.0.0/" Gemfile
+## upstream: rails-api ~> 0.2.0
+## F20: 0.1.0
+#sed -i "s/\(gem 'rails-api'\).*/\1, >= 0.1.0/" Gemfile
+## upstream: jbuilder ~> 2.1.0
+## F20: 1.5.0
+#sed -i "s/\(gem 'jbuilder'\).*/\1, >= 1.5.0/" Gemfile
+## upstream: ~> 4.0.48
+## F20: 4.0.18
+#sed -i "s/\(gem 'passenger'\).*/\1, >= 4.0.18/" Gemfile
+## not needed
+#for p in sdoc capistrano rvm-capistrano debugger fuubar; do
+#  sed -i "s/^\(\s*gem '$p'.*\)/#disabled: \1/" Gemfile
+#done
+## local versions of gems
+#rm Gemfile.lock
+#bundle install --local
+#
+#bundle exec rspec -Ilib spec --require spec_helper
 
 
 %pre
@@ -282,5 +292,5 @@ fi
 
 
 %changelog
-* Thu Sep 18 2014 František Dvořák <valtri@civ.zcu.cz> - 1.0.5-1.20140915gitb11ad8c
+* Wed Sep 24 2014 František Dvořák <valtri@civ.zcu.cz> - 1.0.5-1.20140915gitb11ad8c
 - Initial package