--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/09/04 13:56:36	1.15
+++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/11/06 10:43:17	1.19
@@ -1,4 +1,4 @@
-# $Id: smeserver-coova-chilli.spec,v 1.14 2008/09/01 12:18:32 vip-ire Exp $
+# $Id: smeserver-coova-chilli.spec,v 1.18 2008/09/15 16:11:26 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.2
-%define release 2
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -20,9 +20,15 @@ Requires: e-smith-release >= 7.0
 Requires: openssl 
 Requires: coova-chilli
 Requires: e-smith-radiusd >= 1.0.0-18
+Requires: perl(NetAddr::IP)
 
 Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch
 Patch2: smeserver-coova-chilli-0.2-guest_access.patch
+Patch3: smeserver-coova-chilli-0.2-chilli_ip.patch
+Patch4: smeserver-coova-chilli-0.2-radius_timeout.patch
+Patch5: smeserver-coova-chilli-0.2-guest_access2.patch
+Patch6: smeserver-coova-chilli-0.2-template_syntax_error.patch
+Patch7: smeserver-coova-chilli-0.2-httpd_warning.patch
 
 %description
 This package allow you to configure a third interface
@@ -34,8 +40,22 @@ they'll only have web access if they are
 This contrib will only work in server&gateway mode 
 
 %changelog
+* Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6
+- Remove warning in httpd.conf file (httpd -t)
+
+* Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5
+- Fix Syntax Error in /etc/chilli.conf template (25listen) [4559]
+
+* Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4
+- Requires perl(NetAddr::IP)
+
+* Fri Sep 5 2008 Daniel B. <daniel@firewall-services.com> 0.2-3
+- Chilli IP computed with NetAddr::IP
+- Radius timeout set to 3 sec
+- syntax error in radius users template fixed (for guest access)
+
 * Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2
-- Bug with for guest access
+- Bug fix for guest access
 
 * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1
 - uplink and downlink for guest account are configurable via db keys
@@ -95,8 +115,11 @@ This contrib will only work in server&ga
 %setup
 %patch1 -p1
 %patch2 -p1
-
-find root/ -type f -name *~ -exec rm -f {} \;
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 /usr/bin/perl createlinks