commit c01ba4754d688775a7749169ce578853b82c780e
Author: Jacek Konieczny <[email protected]>
Date: Thu Jun 21 10:00:43 2018 +0200
Version: 2.0.17
uwsgi-plugin_build_dir.patch | 15 ---------------
uwsgi.spec | 11 +++++------
2 files changed, 5 insertions(+), 21 deletions(-)
---
diff --git a/uwsgi.spec b/uwsgi.spec
index 51f2763..1f243f2 100644
--- a/uwsgi.spec
+++ b/uwsgi.spec
@@ -24,18 +24,17 @@
Summary: Fast WSGI server
Summary(pl.UTF-8): Szybki serwer WSGI
Name: uwsgi
-Version: 2.0.12
-Release: 2
+Version: 2.0.17
+Release: 1
License: GPL v2
Group: Networking/Daemons
Source0: http://projects.unbit.it/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 1451cab954bad0d7d7429e4d2c84b5df
+# Source0-md5: 7e487a75791e43d13cfaa690e8d42d36
Source1: %{name}.init
Source2: emperor.ini
Source3: %{name}.tmpfiles
Source4: %{name}.service
-Patch0: %{name}-plugin_build_dir.patch
-Patch1: shared_python.patch
+Patch0: shared_python.patch
URL: http://projects.unbit.it/uwsgi/
%{?with_xml:BuildRequires: libxml2-devel}
%{?with_yaml:BuildRequires: yaml-devel}
@@ -109,7 +108,6 @@ Python 3.x plugin for uWSGI.
%setup -q
%patch0 -p1
-%patch1 -p1
%build
cat >buildconf/pld.ini <<EOF
@@ -118,6 +116,7 @@ main_plugin =
embedded_plugins =
inherit = base
plugin_dir = %{_libdir}/uwsgi
+plugin_build_dir = ${PWD}
xml = %{?with_xml:true}%{!?with_xml:false}
yaml = %{?with_yaml:true}%{!?with_yaml:false}
diff --git a/uwsgi-plugin_build_dir.patch b/uwsgi-plugin_build_dir.patch
deleted file mode 100644
index 9e29f39..0000000
--- a/uwsgi-plugin_build_dir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -dur uwsgi-1.9.12.orig/uwsgiconfig.py uwsgi-1.9.12/uwsgiconfig.py
---- uwsgi-1.9.12.orig/uwsgiconfig.py 2013-06-05 11:14:47.000000000 +0200
-+++ uwsgi-1.9.12/uwsgiconfig.py 2013-06-12 10:05:20.000000000 +0200
-@@ -1128,10 +1128,7 @@
- except:
- pass
-
-- if uc:
-- plugin_dest = uc.get('plugin_dir') + '/' + name + '_plugin'
-- else:
-- plugin_dest = name + '_plugin'
-+ plugin_dest = name + '_plugin'
-
- shared_flag = '-shared'
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/uwsgi.git/commitdiff/c01ba4754d688775a7749169ce578853b82c780e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
