--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/08/28 10:12:16	1.11
+++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/08/28 15:38:40	1.13
@@ -1,4 +1,4 @@
-# $Id: smeserver-coova-chilli.spec,v 1.10 2008/08/28 08:08:19 vip-ire Exp $
+# $Id: smeserver-coova-chilli.spec,v 1.12 2008/08/28 13:14:07 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -6,7 +6,7 @@ Summary: Coova-Chilli, a captive portal
 %define name smeserver-coova-chilli
 Name: %{name}
 %define version 0.1
-%define release 5
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -27,6 +27,9 @@ Patch3: smeserver-coova-chilli-0.1-firew
 Patch4: smeserver-coova-chilli-0.1-loginPageDir.patch
 Patch5: smeserver-coova-chilli-0.1-authTemplate.patch
 Patch6: smeserver-coova-chilli-0.1-fixOUTreset.patch
+Patch7: smeserver-coova-chilli-0.1-uamallowed.patch 
+Patch8: smeserver-coova-chilli-0.1-dnsparano.patch
+Patch9: smeserver-coova-chilli-0.1-cmdsock.patch
 
 %description
 This package allow you to configure a third interface
@@ -38,6 +41,15 @@ they'll only have web access if they are
 This contrib will only work in server&gateway mode 
 
 %changelog
+* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7
+- Reverted moving of default db entries to SPEC file since common practice is to store them in files
+
+* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6
+- split uamallowed (one per line)
+- Add dnsparanoia directive
+- correct cmdsock directive
+- initialise default configuration db in the spec file
+
 * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5
 - Remove the reset of $OUT from the template
 
@@ -75,6 +87,10 @@ This contrib will only work in server&ga
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+
 mv root/opt/chilli.rpmnew/template/images root/opt/chilli/template
 rm -rf root/opt/chilli.rpmnew/
 rm -rf root/etc/e-smith/templates-custom/