Final tweaks for /usr prefix.

diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index a94d7d5..a79b70b 100644 (file)
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -113,6 +113,15 @@ echo 'gem "openssl_cms_2_1", require: false, platforms: :ruby_21' > lib/authenti
 # always use the system gems
 sed -i .bundle/config -e '/.*BUNDLE_DISABLE_SHARED_GEMS.*/d'
 
+# apache >= 2.4, applicaton prefix
+sed -i examples/etc/apache2/sites-available/occi-ssl \
+  -e 's/Allow from all/Require all granted/i' \
+  -e 's,/opt/rOCCI-server,%{app_root},g'
+
+# fix interpreter
+sed -i examples/usr/local/bin/check_occi_compute_create \
+  -e '1s,#!/opt/occi-cli/embedded/bin/ruby,#!/usr/bin/env ruby,'
+
 
 %build
 checkmodule -M -m -o %{semodule_name}.mod %{SOURCE1}
@@ -162,10 +171,6 @@ rm -f %{buildroot}%{app_root}/%{semodule_name}.pp
 
 # httpd configuration tweaks
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
-# apache >= 2.4, applicaton prefix
-sed -i examples/etc/apache2/sites-available/occi-ssl \
-  -e 's/Allow from all/Require all granted/i' \
-  -e 's,/opt/rOCCI-server,%{app_root},g'
 install -p -m 0644 examples/etc/apache2/sites-available/occi-ssl %{buildroot}%{_sysconfdir}/httpd/conf.d/occi-ssl.conf
 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
@@ -247,7 +252,6 @@ fi
 %dir %{app_root}/
 %{app_root}/.bundle/
 %{app_root}/app/
-%{app_root}/bin/
 %{app_root}/config/
 %{app_root}/db/
 %{app_root}/examples/
@@ -262,6 +266,7 @@ fi
 %attr(-,rocci,rocci) %{app_root}/Gemfile.lock
 %attr(-,rocci,rocci) %{_localstatedir}/log/rocci-server/
 %{_datadir}/selinux/packages/%{name}/%{semodule_name}.pp
+%exclude %{app_root}/bin/
 %exclude %{app_root}/.rspec
 %exclude %{app_root}/.travis.yml
 %exclude %{app_root}/Guardfile