--- rpms/smeserver-ejabberd/contribs7/smeserver-ejabberd.spec 2008/07/01 19:56:43 1.6 +++ rpms/smeserver-ejabberd/contribs7/smeserver-ejabberd.spec 2008/07/01 20:01:58 1.7 @@ -5,30 +5,26 @@ Summary: SME Server ejabberd Jabber service %define name smeserver-ejabberd Name: %{name} -%define version 2.0.0 -%define release 6 +%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 -Patch2: %{name}-%{version}-SSLCert.patch -Patch3: smeserver-ejabberd-2.0.0-locale-2008-06-27.patch -Patch4: smeserver-ejabberd-2.0.0-locale-2008-07-01.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 -* Tue Jul 1 2008 Jonathan Martens 2.0.0-6 -- Apply 1 July 2008 locale patch +* Fri Jun 27 2008 Jean-Paul Leclere 2.0.1-1 +- update for ejabberd >= 2.0.1 +- disable polling (thanks to Daniel Berteaud) * Fri Jun 27 2008 Jonathan Martens 2.0.0-5 - Apply 27 Jun 2008 locale patch @@ -91,11 +87,6 @@ exit 0 %prep %setup -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build perl createlinks @@ -115,12 +106,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