From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 18 Sep 2014 20:45:32 +0000 (+0200)
Subject: Polishing. Logstasher in Fedora now.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=040584f8b7db65b35e25828ebf4d150f52aa0226;p=rOCCI-packaging-fedora.git

Polishing. Logstasher in Fedora now.
---

diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index cbbadb9..4024c05 100644
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -27,7 +27,7 @@ BuildRequires:  policycoreutils-python
 BuildRequires:  ruby(release) >= 1.9.3
 BuildRequires:  rubygems-devel
 BuildRequires:  rubygem(rdoc)
-# tests (plus all runtimes)
+# for tests (all runtimes also needed)
 #BuildRequires:  rubygem(rspec)
 #BuildRequires:  rubygem(rspec-rails)
 Requires(pre):  shadow-utils
@@ -44,6 +44,7 @@ Requires:       rubygem(ice_nine)
 # F20: 1.5.0
 Requires:       rubygem(jbuilder)
 Requires:       rubygem(kgio)
+Requires:       rubygem(logstasher)
 # upstream: ~> 4.0.48
 # F20: 4.0.18
 Requires:       rubygem(passenger)
@@ -54,7 +55,6 @@ Requires:       rubygem(rails) <= 4.1
 # upstream: rails-api ~> 0.2.0, F20: 0.1.0
 Requires:       rubygem(rails-api)
 # COPR
-Requires:       rubygem(logstasher)
 Requires:       rubygem(occi-core) >= 4.2.16
 Requires:       rubygem(occi-core) < 4.3
 Requires:       rubygem(rack-cors)
@@ -111,7 +111,6 @@ Requires:       rubygem(erubis)
 # upstream: opennebula ~> 4.6.0
 # current: opennebula 4.8.0
 Requires:       rubygem(opennebula) >= 4.6.0
-#Requires:       rubygem(opennebula) < 4.7
 Requires:       rubygem(ox)
 Requires:       %{name} = %{version}-%{release}
 
@@ -174,6 +173,7 @@ rdoc --op %{buildroot}%{_pkgdocdir} lib app *.md
 chmod -x %{buildroot}%{_pkgdocdir}/images/*.png
 %endif
 
+# Fedora README
 install -p -m 0644 %{SOURCE4} %{buildroot}%{_pkgdocdir}
 
 # SELinux
@@ -188,6 +188,7 @@ install -p -m 0644 examples/etc/apache2/sites-available/occi-ssl %{buildroot}%{_
 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