rpms/uwsgi
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bumped to latest stable version

Browse Source
This commit is contained in:
Jorge Gallegos 2016-07-27 22:59:31 -05:00
parent a71feb42b6
commit 6e11853b72
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -33,3 +33,5 @@
/uwsgi-docs-2d5b92a.tar.gz
/uwsgi-docs-5f5f899.tar.gz
/uwsgi-2.0.12.tar.gz
/uwsgi-2.0.13.1.tar.gz
/uwsgi-docs-0326082.tar.gz

4
sources
View File

@ -1,2 +1,2 @@
aa14770d272007665e3feb8f0b2127e4 uwsgi-docs-5f5f899.tar.gz
1451cab954bad0d7d7429e4d2c84b5df uwsgi-2.0.12.tar.gz
e9ec5b2b296ce21b3787e0579d02bade uwsgi-2.0.13.1.tar.gz
5036553cd529ac5d24940ef2e3a7481f uwsgi-docs-0326082.tar.gz

9
uwsgi.spec
View File

@ -1,10 +1,10 @@
# Version
%global majornumber 2
%global minornumber 0
%global releasenumber 12
%global releasenumber 13.1
# Documentation sources:
%global commit 5f5f8995a9cafca7c09721f62423f68d41c5da28
%global commit 032608205f7dc73c651de6166bd874be859cd7fd
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global docrepo uwsgi-docs
%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
@ -115,7 +115,7 @@
Name: uwsgi
Version: %{majornumber}.%{minornumber}.%{releasenumber}
Release: 9%{?dist}
Release: 1%{?dist}
Summary: Fast, self-healing, application container server
Group: System Environment/Daemons
License: GPLv2 with exceptions
@ -1650,6 +1650,9 @@ fi
%changelog
* Thu Jul 28 2016 Jorge A Gallegos <kad@blegh.net> - 2.0.13.1-1
- Bumped to latest stable
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.12-9
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages

6
uwsgi_fix_rpath.patch
View File

@ -15,7 +15,7 @@ index f39ad63..d9e95bb 100644
if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0:
os._exit(1)
diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py
index 45c58e5..8eb2b73 100644
index d930c44..273cdde 100644
--- a/plugins/php/uwsgiplugin.py
+++ b/plugins/php/uwsgiplugin.py
@@ -19,7 +19,6 @@ LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
@ -27,12 +27,12 @@ index 45c58e5..8eb2b73 100644
LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp' + php_version]
diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py
index eb6755f..b75fa29 100644
index 843876f..69ae68f 100644
--- a/plugins/python/uwsgiplugin.py
+++ b/plugins/python/uwsgiplugin.py
@@ -58,8 +58,6 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ:
LDFLAGS.append("-L%s" % libdir)
LDFLAGS.append("-Wl,-rpath=%s" % libdir)
LDFLAGS.append("-Wl,-rpath,%s" % libdir)
- os.environ['LD_RUN_PATH'] = "%s" % libdir
-

6
uwsgi_trick_chroot_rpmbuild.patch
View File

@ -1,13 +1,13 @@
diff --git a/uwsgiconfig.py b/uwsgiconfig.py
index e447123..4d55f2c 100644
index 59393e1..e43f092 100644
--- a/uwsgiconfig.py
+++ b/uwsgiconfig.py
@@ -1129,10 +1129,7 @@ def build_plugin(path, uc, cflags, ldflags, libs, name = None):
@@ -1422,10 +1422,7 @@ def build_plugin(path, uc, cflags, ldflags, libs, name = None):
except:
pass
- if uc:
- plugin_dest = uc.get('plugin_dir') + '/' + name + '_plugin'
- plugin_dest = uc.get('plugin_build_dir', uc.get('plugin_dir')) + '/' + name + '_plugin'
- else:
- plugin_dest = name + '_plugin'
+ plugin_dest = name + '_plugin'