[packages/graphite-web] apache 2.4 updates, R: python-whisper not older than self

[matkor]

commit 79a1c7e5af94c4982e90481f73f93cd8ffe74e56
Author: Mateusz Korniak <matkor at pld-linux.org>
Date:   Thu Dec 3 14:05:06 2015 +0100

    apache 2.4 updates, R: python-whisper not older than self

 apache.conf       | 10 +++++++++-
 graphite-web.spec |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/graphite-web.spec b/graphite-web.spec
index 22e14df..4d606e0 100644
--- a/graphite-web.spec
+++ b/graphite-web.spec
@@ -1,7 +1,7 @@
 Summary:	A Django webapp for enterprise scalable realtime graphing
 Name:		graphite-web
 Version:	0.9.14
-Release:	0.2
+Release:	0.3
 License:	Apache v2.0
 Group:		Applications/WWW
 Source0:	https://codeload.github.com/graphite-project/%{name}/tar.gz/%{version}
@@ -22,7 +22,7 @@ Requires:	python-pycairo
 Requires:	python-pyparsing
 Requires:	python-pytz
 Requires:	python-simplejson
-Requires:	python-whisper
+Requires:	python-whisper >= %{version}
 Requires:	webapps
 Conflicts:	logrotate < 3.8.0
 BuildArch:	noarch
diff --git a/apache.conf b/apache.conf
index a7dfbcc..011c418 100644
--- a/apache.conf
+++ b/apache.conf
@@ -7,6 +7,7 @@
 	CustomLog /var/log/httpd/graphite-web-access.log common
 
 	Alias /media/ "##PYTHON_SITELIB##/django/contrib/admin/media/"
+	Alias /content/ "/usr/share/graphite/webapp/content/"
 
 	WSGIScriptAlias / /usr/share/graphite/graphite-web.wsgi
 	WSGIImportScript /usr/share/graphite/graphite-web.wsgi process-group=%{GLOBAL} application-group=%{GLOBAL}
@@ -20,6 +21,13 @@
 	</Location>
 </VirtualHost>
 
+# Apache 2.2
+# <Directory /usr/share/graphite>
+#	Allow from all
+# </Directory>
+
+# Apache 2.4
 <Directory /usr/share/graphite>
-	Allow from all
+    Require all granted
+    Allow from all
 </Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/graphite-web.git/commitdiff/4b0a7e4cfc8105a46c2ff4a3f10faeeb793bb7d0