--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/09/04 13:58:06	1.16
+++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2009/03/12 14:54:34	1.25
@@ -1,4 +1,4 @@
-# $Id: smeserver-coova-chilli.spec,v 1.15 2008/09/04 13:56:36 slords Exp $
+# $Id: smeserver-coova-chilli.spec,v 1.24 2009/03/11 08:58:33 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 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -20,9 +20,21 @@ 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
+Patch8:	smeserver-coova-chilli-0.2-tundev.patch
+Patch9: smeserver-coova-chilli-0.2-dhcp_range.patch
+Patch10: smeserver-coova-chilli-0.2-localhost_nas.patch
+Patch11: smeserver-coova-chilli-0.2-localhost_nas2.patch
+Patch12: smeserver-coova-chilli-0.2-squid_template_typo.patch
+Patch13: smeserver-coova-chilli-0.2-typo.patch
 
 %description
 This package allow you to configure a third interface
@@ -34,15 +46,43 @@ they'll only have web access if they are
 This contrib will only work in server&gateway mode 
 
 %changelog
+* Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10
+- Small typo correction
+
+* Tue Mar 10 2009 Daniel B. <daniel@firewall-services.com> 0.2-9
+- Use allready defined localhost NAS to fixe PPTP problem [SME: 4996]
+  (thanks John K Pruder)
+- fix a typo in squid template
+
+* Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8
+- Add dhcpstart and dhcpstop db parameters (thanks John K Pruder)
+
+* Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7
+- Fix tundev template [SME: 5054]
+
+* 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) [SME: 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
 
 * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0
 - Login page is a CGI, with a server-manager login page look
-- Guest Access can be enabled with guestAccess key (enabled/isabled)
+- Guest Access can be enabled with guestAccess key (enabled/disabled)
 - merge patchs in main package
 
 * Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8
@@ -95,6 +135,17 @@ This contrib will only work in server&ga
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 /usr/bin/perl createlinks