--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/04/15 15:18:07	1.2
+++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/08/27 11:36:18	1.3
@@ -1,24 +1,23 @@
-# $Id: smeserver-coova-chilli.spec,v 1.1 2008/04/15 15:04:56 slords Exp $
-# Authority: vip-ire
-# Name: Daniel Berteaud
-
 Summary: Coova-Chilli, a captive portal based on ChilliSpot configured for SME server
 %define name smeserver-coova-chilli
 Name: %{name}
 %define version 0.1
-%define release 1
+%define release 2.el4.sme
 Version: %{version}
-Release: %{release}%{?dist}
-License: GPL
+Release: %{release}
+Copyright: GPL
 Group: Networking/Remote access
 Source: %{name}-%{version}.tar.gz
-Patch1: smeserver-coova-chilli-0.1-bypass_auth_with_squid_fix.patch
-Patch2: smeserver-coova-chilli-0.1-expand_masq_fix.patch
 URL: http://sme.firewall-services.com
+Packager: Daniel Berteaud <daniel@firewall-services.com> 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-release >= 7.0 openssl coova-chilli
-BuildRequires: e-smith-devtools >= 1.13.1-03
+
+Patch1: smeserver-coova-chilli-0.1-bypass_auth_with_squid_fix.patch
+Patch2: smeserver-coova-chilli-0.1-expand_masq_fix.patch
+Patch3: smeserver-coova-chilli-0.1-firewall2db.patch
+Patch4: smeserver-coova-chilli-0.1-loginPageDir.patch
 
 %description
 This package allow you to configure a third interface
@@ -29,6 +28,14 @@ on a logon page and they'll have to ente
 they'll only have web access if they are members of the group "chilli" 
 
 %changelog
+* Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com>
+- [0.1-2]
+- Most firewall customizations (for incomming and forwarded traffic from 
+  chilli network only) can be set through db commands (Patch3)
+- Outgoing DNS is allowed only for the two DNS servers configured
+- Clean spec file, adn put php files in /opt/chilli (Patch4)
+
+
 * Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>
 - [0.1-1]
 - security fixe: auth bypass with squid (patch1)
@@ -42,6 +49,8 @@ they'll only have web access if they are
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 /usr/bin/perl createlinks
@@ -53,6 +62,16 @@ they'll only have web access if they are
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
 	--file /etc/chilli/conup.sh 'attr(0750,root,root)' \
 	--file /etc/chilli/condown.sh 'attr(0750,root,root)' \
+	--file /opt/chilli/hotspotlogin-loginform.php 'config(noreplace)' \
+	--file /opt/chilli/hotspotlogin-nonchilli.php 'config(noreplace)' \
+        --file /opt/chilli/hotspotlogin-nonssl.php 'config(noreplace)' \
+        --file /opt/chilli/hotspotlogin.php 'config(noreplace)' \
+        --file /opt/chilli/lang/en.php 'config(noreplace)' \
+        --file /opt/chilli/lang/fr.php 'config(noreplace)' \
+        --file /opt/chilli/lang/main.php 'config(noreplace)' \
+        --file /opt/chilli/template/loggingin.php 'config(noreplace)' \
+        --file /opt/chilli/template/loginform-footer.php 'config(noreplace)' \
+        --file /opt/chilli/template/loginform-header.php 'config(noreplace)' \
 	> %{name}-%{version}-filelist
 
 %files -f %{name}-%{version}-filelist
@@ -61,14 +80,18 @@ they'll only have web access if they are
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+
+
 %post
-if [ ! -e /opt/chilli ]; then
-	/bin/cp -a /opt/chilli.rpmnew /opt/chilli
-fi
 
 %preun
+
 if [ $1 == 0 ]; then
 	/sbin/e-smith/db configuration setprop chilli status disabled
-	/sbin/e-smith/signal-event chilli-update
+	/etc/rc.d/init.d/chilli stop > /dev/null 2>&1
+	true
 fi
 
+%postun
+