--- rpms/smeserver-ejabberd/contribs7/smeserver-ejabberd.spec	2008/05/22 18:44:09	1.3
+++ rpms/smeserver-ejabberd/contribs7/smeserver-ejabberd.spec	2008/07/01 20:01:58	1.7
@@ -1,28 +1,39 @@
-# $Id: smeserver-ejabberd.spec,v 1.2 2008/05/21 20:10:23 snetram Exp $
+# $Id: smeserver-ejabberd.spec,v 1.5 2008/06/27 15:20:30 snetram Exp $
 # Authority: gnujpl
 # Name: Jean-Paul Leclère
 
 Summary: SME Server ejabberd Jabber service
 %define name smeserver-ejabberd
 Name: %{name}
-%define version 2.0.0
-%define release 3
+%define version 2.0.1
+%define release 1
 
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: smeserver-ejabberd-2.0.0-locale-2008-05-21.patch
-Patch1: %{name}-%{version}-removeOpt.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 BuildRequires: e-smith-devtools >= 1.7.5
-Requires: ejabberd = 2.0.0
+Requires: ejabberd >= 2.0.1
+Requires: e-smith-formmagick >= 1.4.0-12
 Obsoletes: e-smith-jabber
 AutoReqProv: no
 
 %changelog
+* Fri Jun 27 2008 Jean-Paul Leclere <jean-paul@leclere.org> 2.0.1-1
+- update for ejabberd >= 2.0.1
+- disable polling (thanks to Daniel Berteaud)
+
+* Fri Jun 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-5
+- Apply 27 Jun 2008 locale patch
+- Added missing dependency on e-smith-formmagick >= 1.4.0-12
+
+* Sun Jun 22 2008 Jean-Paul Leclere <jean-paul@leclere.org> 2.0.0-4
+- use new ejabberd ssl cert file in /var/service/ejabberd/ssl
+- sync ejabberd cert file with SME cert file
+
 * Thu May 22 2008 Jean-Paul Leclere <jean-paul@leclere.org> 2.0.0-3
 - no more use /opt 
 - use SME server ssl certs
@@ -76,8 +87,6 @@ exit 0
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
 
 %build
 perl createlinks
@@ -91,23 +100,19 @@ rm -f %{name}-%{version}-%{release}-file
     --file '/var/service/ejabberd/down' 'attr(0644,root,root)' \
     --file '/var/service/ejabberd/run' 'attr(0755,root,root)' \
     --dir '/var/service/ejabberd/supervise' 'attr(0700,root,root)' \
+    --file '/var/service/ejabberd/control/2' 'attr(0755,root,root)' \
     --dir '/var/service/ejabberd/log' 'attr(1755,root,root)' \
     --file '/var/service/ejabberd/log/run' 'attr(0755,root,root)' \
     --dir '/var/service/ejabberd/log/supervise' 'attr(0700,root,root)' \
     --dir '/var/log/ejabberd' 'attr(0750,ejabberd,ejabberd)' \
     --dir '/var/log/ejabberd.run' 'attr(0750,smelog,root)' \
-    --ignoredir '/opt/ejabberd/database/ejabberd' \
-    --ignoredir '/opt/ejabberd/database' \
-    --ignoredir '/opt/ejabberd/conf/ssl.pem' \
-    --ignoredir '/opt/ejabberd/conf' \
-    --ignoredir '/opt/ejabberd' \
-    --ignoredir '/opt' \
      > %{name}-%{version}-%{release}-filelist
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+mkdir -p /var/service/ejabberd/ssl
 
 %postun