commit dc269c4a564114cf63335748bb5faaeb3f17ccc4
Author: Jacek Konieczny <[email protected]>
Date: Wed Apr 13 09:09:40 2016 +0200
Version: 2.0.12
shared_python.patch | 12 ++++++++++++
uwsgi.spec | 15 +++++++++++----
2 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/uwsgi.spec b/uwsgi.spec
index 8546524..00ea856 100644
--- a/uwsgi.spec
+++ b/uwsgi.spec
@@ -24,17 +24,18 @@
Summary: Fast WSGI server
Summary(pl.UTF-8): Szybki serwer WSGI
Name: uwsgi
-Version: 2.0.10
-Release: 4
+Version: 2.0.12
+Release: 1
License: GPL v2
Group: Networking/Daemons
Source0: http://projects.unbit.it/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 7a9be0db5f6a8d4150dc5e9e0517ce80
+# Source0-md5: 1451cab954bad0d7d7429e4d2c84b5df
Source1: %{name}.init
Source2: emperor.ini
Source3: %{name}.tmpfiles
Source4: %{name}.service
Patch0: %{name}-plugin_build_dir.patch
+Patch1: shared_python.patch
URL: http://projects.unbit.it/uwsgi/
%{?with_xml:BuildRequires: libxml2-devel}
%{?with_yaml:BuildRequires: yaml-devel}
@@ -107,6 +108,7 @@ Python 3.x plugin for uWSGI.
%setup -q
%patch0 -p1
+%patch1 -p1
%build
cat >buildconf/pld.ini <<EOF
@@ -140,7 +142,8 @@ for plugin in \
cheaper_busyness symcall transformation_tofile \
transformation_gzip transformation_chunked \
transformation_offload router_memcached router_redis \
- router_hash ; do
+ router_hash router_expires router_metrics \
+ transformation_template stats_pusher_socket ; do
%{__python} uwsgiconfig.py --plugin plugins/${plugin} pld ${plugin}
done
@@ -303,9 +306,11 @@ EOF
%{_libdir}/%{name}/redislog_plugin.so
%{_libdir}/%{name}/router_basicauth_plugin.so
%{_libdir}/%{name}/router_cache_plugin.so
+%{_libdir}/%{name}/router_expires_plugin.so
%{_libdir}/%{name}/router_hash_plugin.so
%{_libdir}/%{name}/router_http_plugin.so
%{_libdir}/%{name}/router_memcached_plugin.so
+%{_libdir}/%{name}/router_metrics_plugin.so
%{_libdir}/%{name}/router_redirect_plugin.so
%{_libdir}/%{name}/router_redis_plugin.so
%{_libdir}/%{name}/router_rewrite_plugin.so
@@ -317,11 +322,13 @@ EOF
%{_libdir}/%{name}/signal_plugin.so
%{_libdir}/%{name}/spooler_plugin.so
%{_libdir}/%{name}/sslrouter_plugin.so
+%{_libdir}/%{name}/stats_pusher_socket_plugin.so
%{_libdir}/%{name}/symcall_plugin.so
%{_libdir}/%{name}/syslog_plugin.so
%{_libdir}/%{name}/transformation_chunked_plugin.so
%{_libdir}/%{name}/transformation_gzip_plugin.so
%{_libdir}/%{name}/transformation_offload_plugin.so
+%{_libdir}/%{name}/transformation_template_plugin.so
%{_libdir}/%{name}/transformation_tofile_plugin.so
%{_libdir}/%{name}/ugreen_plugin.so
%{_libdir}/%{name}/zergpool_plugin.so
diff --git a/shared_python.patch b/shared_python.patch
new file mode 100644
index 0000000..5959888
--- /dev/null
+++ b/shared_python.patch
@@ -0,0 +1,12 @@
+diff -dur uwsgi-2.0.12.orig/plugins/python/uwsgiplugin.py
uwsgi-2.0.12/plugins/python/uwsgiplugin.py
+--- uwsgi-2.0.12.orig/plugins/python/uwsgiplugin.py 2015-12-30
10:08:49.000000000 +0100
++++ uwsgi-2.0.12/plugins/python/uwsgiplugin.py 2016-04-13 09:18:38.000000000
+0200
+@@ -19,7 +19,7 @@
+ if not 'UWSGI_PYTHON_NOLIB' in os.environ:
+ LIBS = sysconfig.get_config_var('LIBS').split() +
sysconfig.get_config_var('SYSLIBS').split()
+ # check if it is a non-shared build (but please, add --enable-shared to
your python's ./configure script)
+- if not sysconfig.get_config_var('Py_ENABLE_SHARED'):
++ if 0:
+ libdir = sysconfig.get_config_var('LIBPL')
+ # libdir does not exists, try to get it from the venv
+ version = get_python_version()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/uwsgi.git/commitdiff/d8956bc68c4918ea1169cc80b8ebe37782c09763
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
