From 8946c1df1b94e277749f5cc9562a5998e0633d58 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Wed, 24 Apr 2013 18:06:39 +0200
Subject: Django 1.4 compatibility

---
 hyperkitty.spec                             | 2 +-
 hyperkitty/templates/recent_activities.html | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hyperkitty.spec b/hyperkitty.spec
index 0daa41f..fc42e81 100644
--- a/hyperkitty.spec
+++ b/hyperkitty.spec
@@ -131,7 +131,7 @@ rm -f hyperkitty_standalone/__init__.py hyperkitty_standalone/settings_local.py
 %{__python} %{_sysconfdir}/%{name}/sites/default/manage.py \
     collectstatic --noinput >/dev/null || :
 %{__python} %{_sysconfdir}/%{name}/sites/default/manage.py \
-    assets build --parse-templates >/dev/null || :
+    assets build --parse-templates &>/dev/null || :
 
 
 %preun
diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html
index b46f06b..925b076 100644
--- a/hyperkitty/templates/recent_activities.html
+++ b/hyperkitty/templates/recent_activities.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+
+{% load url from future %}
 {% load hk_generic %}
 {% load gravatar %}
 {% load storm %}
-- 
cgit