FIX: conflict in settings.py

[myslice.git] / myslice.spec

diff --git a/myslice.spec b/myslice.spec
index bae532e..83d7711 100644 (file)
--- a/myslice.spec
+++ b/myslice.spec
@@ -1,6 +1,6 @@
 %define name myslice
 %define version 0.1
-%define taglevel 2
+%define taglevel 3
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -16,7 +16,6 @@ Vendor: OpenLab
 Packager: OpenLab <thierry.parmentelat@inria.fr>
 URL: %{SCMURL}
 
-# We use set everywhere
 Requires: python >= 2.7
 Requires: Django
 Requires: httpd
@@ -47,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myslice/*
 
 %changelog
+* Mon Apr 08 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myslice-django-0.1-3
+- a small number of representative plugins are available
+- next step is to correlate a Get query with its corresponding Update like in slice.php
+
 * Mon Mar 25 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myslice-django-0.1-2
 - new pluing 'hazelnut' which is a tmpname for the former datatables one
 - querycode is syntaxhighlighter-enabled