--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/08/27 11:41:16	1.4
+++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/08/27 20:10:47	1.8
@@ -1,18 +1,25 @@
+# $Id: smeserver-coova-chilli.spec,v 1.7 2008/08/27 13:44:45 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 2.el4.sme
+%define release 3
 Version: %{version}
-Release: %{release}
+Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Remote access
 Source: %{name}-%{version}.tar.gz
 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
+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
@@ -25,16 +32,21 @@ 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
+* 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-lib >= 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 
+- 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)
-
+- Clean spec file, and put php files in /opt/chilli (Patch4)
 
 * Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>
 - [0.1-1]
@@ -51,6 +63,8 @@ they'll only have web access if they are
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+rm -rf root/opt/chilli.rpmnew/
+rm -rf root/etc/e-smith/templates-custom/
 
 %build
 /usr/bin/perl createlinks
@@ -80,18 +94,10 @@ they'll only have web access if they are
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-
-
-%post
-
 %preun
 
 if [ $1 == 0 ]; then
 	/sbin/e-smith/db configuration setprop chilli status disabled
-	/etc/rc.d/init.d/chilli stop > /dev/null 2>&1
-	true
+	/etc/rc.d/init.d/chilli stop >& /dev/null || :
 fi
 
-%postun
-