--- rpms/smeserver-ejabberd/contribs7/smeserver-ejabberd.spec	2008/06/22 20:45:25	1.4
+++ rpms/smeserver-ejabberd/contribs7/smeserver-ejabberd.spec	2011/01/02 21:28:33	1.26
@@ -1,29 +1,103 @@
-# $Id: smeserver-ejabberd.spec,v 1.3 2008/05/22 18:44:09 gnujpl Exp $
+# $Id: smeserver-ejabberd.spec,v 1.25 2010/05/23 19:13:41 slords 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 4
+%define version 2.0.1
+%define release 18
 
 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
-Patch2: %{name}-%{version}-SSLCert.patch
+Patch1: smeserver-ejabberd-2.0.1-locale-2008-07-01.patch
+Patch2: smeserver-ejabberd-2.0.1-locale-2008-10-14.patch
+Patch3: smeserver-ejabberd-2.0.1-locale-2008-10-16.patch
+Patch4: smeserver-ejabberd-2.0.1-locale-2008-11-19.patch
+Patch5: smeserver-ejabberd-2.0.1-locale-2008-11-30.patch
+Patch6: smeserver-ejabberd-2.0.1-locale-2009-01-01.patch
+Patch7: smeserver-ejabberd-2.0.1-locale-2009-01-31.patch
+Patch8: smeserver-ejabberd-2.0.1-locale-2009-03-01.patch
+Patch9: smeserver-ejabberd-2.0.1-locale-2009-03-03.patch
+Patch10: smeserver-ejabberd-2.0.1-locale-2009-04-27.patch
+Patch11: smeserver-ejabberd-2.0.1-locale-2009-05-20.patch
+Patch12: smeserver-ejabberd-2.0.1-locale-2009-08-24.patch
+Patch13: smeserver-ejabberd-2.0.1-locale-2009-10-21.patch
+Patch14: smeserver-ejabberd-2.0.1-locale-2009-10-27.patch
+Patch15: smeserver-ejabberd-2.0.1-locale-2010-03-02.patch
+Patch16: smeserver-ejabberd-2.0.1-locale-2010-05-23.patch
+Patch17: smeserver-ejabberd-2.0.1-mod_admin_extra.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
+* Sun Jan 2 2011 Jean-Paul Leclere <jean-paul@leclere.org> 2.0.1-18.sme
+- add mod_admin_extra support (see Bug 6462)
+
+* Sun May 23 2010 SME Translation Server <translations@contribs.org> 2.0.1-17.sme
+- apply locale 2010-05-23 patch
+
+* Tue Mar 02 2010 SME Translation Server <translations@contribs.org> 2.0.1-16.sme
+- apply locale 2010-03-02 patch
+
+* Tue Oct 27 2009 SME Translation Server <translations@contribs.org> 2.0.1-15.sme
+- apply locale 2009-10-27 patch
+
+* Wed Oct 21 2009 SME Translation Server <translations@contribs.org> 2.0.1-14.sme
+- apply locale 2009-10-21 patch
+
+* Mon Aug 24 2009 SME Translation Server <translations@contribs.org> 2.0.1-13.sme
+- apply locale 2009-08-24 patch
+
+* Wed May 20 2009 SME Translation Server <translations@contribs.org> 2.0.1-12.sme
+- apply locale 2009-05-20 patch
+
+* Mon Apr 27 2009 SME Translation Server <translations@contribs.org> 2.0.1-11.sme
+- apply locale 2009-04-27 patch
+
+* Tue Mar 03 2009 SME Translation Server
+- apply locale 2009-03-03 patch
+
+* Sun Mar  1 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.1-9
+- Apply  1 Mar 2009 locale patch [SME: 5018]
+
+* Sat Jan 31 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.1-8
+- Apply 31 Jan 2009 locale patch [SME: 4951]
+
+* Thu Jan  1 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.1-7
+- Apply  1 Jan 2009 locale patch [SME: 4900]
+
+* Sun Nov 30 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.1-6
+- Apply 30 Nov 2008 locale patch
+
+* Wed Nov 19 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.1-5
+- Apply 19 Nov 2008 locale patch
+
+* Thu Oct 16 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.1-4
+- Apply 16 Oct 2008 locale patch
+
+* Tue Oct 14 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.1-3
+- Apply 14 Oct 2008 locale patch
+
+* Tue Jul 1 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.1-2
+- Apply 1 July 2008 locale patch
+
+* 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
@@ -81,9 +155,23 @@ exit 0
 
 %prep
 %setup
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 perl createlinks
@@ -103,12 +191,6 @@ 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)' \
-    --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