--- 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/28 07:47:34	1.9
@@ -1,4 +1,4 @@
-# $Id: smeserver-coova-chilli.spec,v 1.1 2008/04/15 15:04:56 slords Exp $
+# $Id: smeserver-coova-chilli.spec,v 1.8 2008/08/27 20:10:47 snetram Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -6,19 +6,26 @@ Summary: Coova-Chilli, a captive portal
 %define name smeserver-coova-chilli
 Name: %{name}
 %define version 0.1
-%define release 1
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: 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
 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
+BuildRequires: e-smith-devtools
+Requires: e-smith-release >= 7.0 
+Requires: openssl 
+Requires: coova-chilli
+Requires: esmith-radiusd >= 1.0.0-18
+
+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
+Patch5: smeserver-coova-chilli-0.1-authTemplate.patch
 
 %description
 This package allow you to configure a third interface
@@ -26,9 +33,26 @@ This package allow you to configure a th
 a secured captive portal. Users will be redirected
 on a logon page and they'll have to enter credentials
 (sme accounts) before the server allows them. By default, 
-they'll only have web access if they are members of the group "chilli" 
+they'll only have web access if they are members of the group "chilli"
+This contrib will only work in server&gateway mode 
 
 %changelog
+* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-4
+- Add template to enable auth module unix (replace the template-custom)
+- Copy images to /opt/chilli/template before removing .rpmnew directory
+
+* Wed Aug 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-3
+- Split requirements to one per line
+- Removed .rpmnew directory from package
+- Removed the need for templates-custom as package now requires e-smith-radiusd >= 1.0.0-18
+
+* 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, and 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 +66,12 @@ they'll only have web access if they are
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -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/
 
 %build
 /usr/bin/perl createlinks
@@ -53,6 +83,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 +101,10 @@ they'll only have web access if they are
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
-%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 || :
 fi