# HG changeset patch
# User Guido Berhoerster <guido+packaging@berhoerster.name>
# Date 1378747295 -7200
# Node ID 8f3c148d4f0d43a70067fcd894c3a74c61b7465a
# Parent  6f2f488ec30d3548539a7a276550bf10ba4ea320
Update to version 1.9.15

diff -r 6f2f488ec30d -r 8f3c148d4f0d sources
--- a/sources	Sat Jul 27 13:52:48 2013 +0200
+++ b/sources	Mon Sep 09 19:21:35 2013 +0200
@@ -1,2 +1,2 @@
-2b1db702a7c13001fd9fb6341e6c620e 80da85d58cbaded82ece2b2329dddfdc0291ce0a.zip
-ec9cf333534604f17ef4e24051d9d65d uwsgi-1.9.14.tar.gz
+a1e6064f892bd823cc8de792669a0800 63bde22cd047e8ff0da9bbb98d2ad2cdf9be2d5a.zip
+e2a1c245e0b8b7e3c8dff8dbbfca52f3 uwsgi-1.9.15.tar.gz
diff -r 6f2f488ec30d -r 8f3c148d4f0d uwsgi-do-not-install-plugins-into-plugin_dir.patch
--- a/uwsgi-do-not-install-plugins-into-plugin_dir.patch	Sat Jul 27 13:52:48 2013 +0200
+++ b/uwsgi-do-not-install-plugins-into-plugin_dir.patch	Mon Sep 09 19:21:35 2013 +0200
@@ -1,8 +1,8 @@
-Index: uwsgi-1.9.14/uwsgiconfig.py
+Index: uwsgi-1.9.15/uwsgiconfig.py
 ===================================================================
---- uwsgi-1.9.14.orig/uwsgiconfig.py
-+++ uwsgi-1.9.14/uwsgiconfig.py
-@@ -1175,10 +1175,7 @@ def build_plugin(path, uc, cflags, ldfla
+--- uwsgi-1.9.15.orig/uwsgiconfig.py
++++ uwsgi-1.9.15/uwsgiconfig.py
+@@ -1188,10 +1188,7 @@ def build_plugin(path, uc, cflags, ldfla
      except:
          pass
  
diff -r 6f2f488ec30d -r 8f3c148d4f0d uwsgi-no-rpath.patch
--- a/uwsgi-no-rpath.patch	Sat Jul 27 13:52:48 2013 +0200
+++ b/uwsgi-no-rpath.patch	Mon Sep 09 19:21:35 2013 +0200
@@ -1,7 +1,7 @@
-Index: uwsgi-1.9.13/plugins/php/uwsgiplugin.py
+Index: uwsgi-1.9.15/plugins/php/uwsgiplugin.py
 ===================================================================
---- uwsgi-1.9.13.orig/plugins/php/uwsgiplugin.py
-+++ uwsgi-1.9.13/plugins/php/uwsgiplugin.py
+--- uwsgi-1.9.15.orig/plugins/php/uwsgiplugin.py
++++ uwsgi-1.9.15/plugins/php/uwsgiplugin.py
 @@ -22,7 +22,6 @@ CFLAGS = [os.popen(PHPPATH + ' --include
  LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
  if ld_run_path:
@@ -10,10 +10,10 @@
  
  LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5']
  
-Index: uwsgi-1.9.13/plugins/python/uwsgiplugin.py
+Index: uwsgi-1.9.15/plugins/python/uwsgiplugin.py
 ===================================================================
---- uwsgi-1.9.13.orig/plugins/python/uwsgiplugin.py
-+++ uwsgi-1.9.13/plugins/python/uwsgiplugin.py
+--- uwsgi-1.9.15.orig/plugins/python/uwsgiplugin.py
++++ uwsgi-1.9.15/plugins/python/uwsgiplugin.py
 @@ -44,10 +44,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro
      else:
          try:
@@ -25,10 +25,10 @@
  
          LIBS.append('-lpython%s' % get_python_version())
  else:
-Index: uwsgi-1.9.13/plugins/rack/uwsgiplugin.py
+Index: uwsgi-1.9.15/plugins/rack/uwsgiplugin.py
 ===================================================================
---- uwsgi-1.9.13.orig/plugins/rack/uwsgiplugin.py
-+++ uwsgi-1.9.13/plugins/rack/uwsgiplugin.py
+--- uwsgi-1.9.15.orig/plugins/rack/uwsgiplugin.py
++++ uwsgi-1.9.15/plugins/rack/uwsgiplugin.py
 @@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir
  
  if has_shared == 'yes':
@@ -36,11 +36,11 @@
 -    os.environ['LD_RUN_PATH'] = libpath
      LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip())
  else:
-     GCC_LIST.append("%s/%s" % (libpath, os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBRUBY_A']\"" % rbconfig).read().rstrip()))
-Index: uwsgi-1.9.13/plugins/ruby19/uwsgiplugin.py
+     rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip()
+Index: uwsgi-1.9.15/plugins/ruby19/uwsgiplugin.py
 ===================================================================
---- uwsgi-1.9.13.orig/plugins/ruby19/uwsgiplugin.py
-+++ uwsgi-1.9.13/plugins/ruby19/uwsgiplugin.py
+--- uwsgi-1.9.15.orig/plugins/ruby19/uwsgiplugin.py
++++ uwsgi-1.9.15/plugins/ruby19/uwsgiplugin.py
 @@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"req
  
  libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()
@@ -48,10 +48,10 @@
 -os.environ['LD_RUN_PATH'] = libpath
  LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split()
  
-Index: uwsgi-1.9.13/plugins/jvm/uwsgiplugin.py
+Index: uwsgi-1.9.15/plugins/jvm/uwsgiplugin.py
 ===================================================================
---- uwsgi-1.9.13.orig/plugins/jvm/uwsgiplugin.py
-+++ uwsgi-1.9.13/plugins/jvm/uwsgiplugin.py
+--- uwsgi-1.9.15.orig/plugins/jvm/uwsgiplugin.py
++++ uwsgi-1.9.15/plugins/jvm/uwsgiplugin.py
 @@ -59,11 +59,6 @@ if "-framework JavaVM" in JVM_LIBPATH:
  
  GCC_LIST = ['jvm_plugin']
diff -r 6f2f488ec30d -r 8f3c148d4f0d uwsgi.spec
--- a/uwsgi.spec	Sat Jul 27 13:52:48 2013 +0200
+++ b/uwsgi.spec	Mon Sep 09 19:21:35 2013 +0200
@@ -1,8 +1,8 @@
 # revision of the uwsgi documentation corresponding to the packaged release
-%global uwsgi_docs_rev  80da85d58cbaded82ece2b2329dddfdc0291ce0a
+%global uwsgi_docs_rev  63bde22cd047e8ff0da9bbb98d2ad2cdf9be2d5a
 
 Name:           uwsgi
-Version:        1.9.14
+Version:        1.9.15
 Release:        1%{?dist}
 Summary:        Complete Stack for Building Clustered/Distributed Network Applications
 
@@ -380,6 +380,8 @@
 blacklist_plugins="${blacklist_plugins} gccgo"
 # does not build
 blacklist_plugins="${blacklist_plugins} rbthreads"
+# needs glusterfs >= 3.4
+blacklist_plugins="${blacklist_plugins} glusterfs"
 
 embed_plugins="null"
 
@@ -501,6 +503,7 @@
 %{_sbindir}/uwsgi
 %dir %{_localstatedir}/run/uwsgi
 %dir %{_libdir}/uwsgi
+%{_libdir}/%{name}/admin_plugin.so
 %{_libdir}/%{name}/cache_plugin.so
 %{_libdir}/%{name}/cgi_plugin.so
 %{_libdir}/%{name}/cheaper_busyness_plugin.so
@@ -516,8 +519,10 @@
 %{_libdir}/%{name}/notfound_plugin.so
 %{_libdir}/%{name}/objc_gc_plugin.so
 %{_libdir}/%{name}/ping_plugin.so
+%{_libdir}/%{name}/pty_plugin.so
 %{_libdir}/%{name}/rawrouter_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
@@ -529,12 +534,14 @@
 %{_libdir}/%{name}/router_uwsgi_plugin.so
 %{_libdir}/%{name}/router_xmldir_plugin.so
 %{_libdir}/%{name}/rpc_plugin.so
+%{_libdir}/%{name}/rsyslog_plugin.so
 %{_libdir}/%{name}/signal_plugin.so
 %{_libdir}/%{name}/spooler_plugin.so
 %{_libdir}/%{name}/ssi_plugin.so
 %{_libdir}/%{name}/sslrouter_plugin.so
 %{_libdir}/%{name}/stats_pusher_statsd_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
@@ -544,9 +551,6 @@
 %{_libdir}/%{name}/webdav_plugin.so
 %{_libdir}/%{name}/xattr_plugin.so
 %{_libdir}/%{name}/zergpool_plugin.so
-%{_libdir}/%{name}/admin_plugin.so
-%{_libdir}/%{name}/syslog_plugin.so
-%{_libdir}/%{name}/rsyslog_plugin.so
 
 %{_libdir}/%{name}/carbon_plugin.so
 %{_libdir}/%{name}/emperor_amqp_plugin.so
@@ -681,6 +685,9 @@
 %{_libdir}/httpd/modules/mod_uwsgi.so
 
 %changelog
+* Mon Sep  9 2013 Guido Berhoerster <guido+packaging@berhoerster.name> - 1.9.15-1
+- Update to version 1.9.15
+
 * Sat Jul 27 2013 Guido Berhoerster <guido+packaging@berhoerster.name> - 1.9.14-1
 - Update to version 1.9.14