From 9228307da548b5458c36e2664265c9b3e8c61c71bc6dc1c2e3790a5b3858f051 Mon Sep 17 00:00:00 2001 From: James Oakley Date: Fri, 31 May 2013 21:38:50 +0000 Subject: [PATCH] Ensure that only Ruby 1.9 is used OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=11 --- uwsgi.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/uwsgi.spec b/uwsgi.spec index ad39156..aebeb7e 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -332,6 +332,7 @@ This package contains support for Python applications via the WSGI protocol. Summary: Ruby Plugin for uWSGI Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version} +Requires: ruby19 Provides: uwsgi-fiber = %{version} Obsoletes: uwsgi-fiber < 1.9.11 @@ -425,7 +426,7 @@ excluded_plugins="$excluded_plugins cplusplus dummy example" %if 0%{?suse_version} && 0%{?suse_version} <= 1210 # Requirements missing on openSUSE <= 12.1 -excluded_plugins="$excluded_plugins erlang fiber pyerl ruby19 systemd_logger" +excluded_plugins="$excluded_plugins erlang fiber pyerl rack ruby19 systemd_logger" %endif plugins=$(python -c "import sys, os; print ', '.join([p for p in os.listdir('plugins') if p not in sys.argv[1:]])" $excluded_plugins) @@ -439,6 +440,7 @@ cp %{SOURCE7} . export UWSGICONFIG_JVM_LIBPATH=$(dirname $(find %{_jvmdir}/java/jre/lib -name "libjvm.so" | grep server)) export UWSGICONFIG_JVM_INCPATH="%{_jvmdir}/java/include" export UWSGICONFIG_LUALIB="lua" +export UWSGICONFIG_RUBYPATH="ruby1.9" export CFLAGS="%{optflags} -I$(echo %{_libdir}/erlang/lib/erl_interface-*/include) -I%{_jvmdir}/java/include/linux -L$UWSGICONFIG_JVM_LIBPATH/jli" %{?jobs:export CPUCOUNT=%jobs} python uwsgiconfig.py --build opensuse