--- rpms/smeserver-ejabberd/contribs7/smeserver-ejabberd.spec	2008/05/21 20:10:23	1.2
+++ rpms/smeserver-ejabberd/contribs7/smeserver-ejabberd.spec	2008/05/22 18:44:09	1.3
@@ -1,4 +1,4 @@
-# $Id: smeserver-ejabberd.spec,v 1.1 2008/05/15 17:16:30 slords Exp $
+# $Id: smeserver-ejabberd.spec,v 1.2 2008/05/21 20:10:23 snetram Exp $
 # Authority: gnujpl
 # Name: Jean-Paul Leclère
 
@@ -6,7 +6,7 @@ Summary: SME Server ejabberd Jabber serv
 %define name smeserver-ejabberd
 Name: %{name}
 %define version 2.0.0
-%define release 2
+%define release 3
 
 Version: %{version}
 Release: %{release}%{?dist}
@@ -14,17 +14,20 @@ 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.0
 Obsoletes: e-smith-jabber
 AutoReqProv: no
 
-%package debug
-Group: Networking/Daemons
-Summary: smeserver-ejabberd debug package
-
 %changelog
+* Thu May 22 2008 Jean-Paul Leclere <jean-paul@leclere.org> 2.0.0-3
+- no more use /opt 
+- use SME server ssl certs
+- db migrate process
+
 * Thu May 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-2
 - Apply 21 May 2008 locale patch
 
@@ -56,19 +59,25 @@ Summary: smeserver-ejabberd debug packag
 %description
 SME Server implementation of ejabberd XMPP server
 
-%description debug
-SME ejabberd server debug package
-
 %pre
 
 %preun
 if [ $1 -eq 0 ]; then
-/opt/ejabberd/bin/preuninstall.sh
+# remove, not upgrade
+/sbin/e-smith/db configuration delete ejabberd
+/sbin/e-smith/db configuration delete ejabberd.init
+/usr/bin/sv down /service/ejabberd
+/usr/lib/erlang/bin/epmd -kill
+cd /service/ejabberd
+rm /service/ejabberd
+/usr/bin/sv exit . log
 fi
+exit 0
 
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
 
 %build
 perl createlinks
@@ -87,19 +96,20 @@ rm -f %{name}-%{version}-%{release}-file
     --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)' \
- | egrep -v '^/opt/ejabberd/(database/ejabberd/|conf/ejabberd.cfg)'     > %{name}-%{version}-%{release}-filelist
+    --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
-chown -R ejabberd.ejabberd /opt/ejabberd/database/ejabberd
-chown -R ejabberd.ejabberd /opt/ejabberd/conf
 
 %postun
 
 %files -f %{name}-%{version}-%{release}-filelist 
 %defattr(-,root,root)
-%attr(0660,ejabberd,ejabberd) %config(noreplace) /opt/ejabberd/conf/ejabberd.cfg
-%files debug -f debugfiles.list 
-%defattr(-,root,root)