--- rpms/smeserver-ejabberd/contribs7/smeserver-ejabberd.spec 2008/05/22 18:44:09 1.3 +++ rpms/smeserver-ejabberd/contribs7/smeserver-ejabberd.spec 2008/06/22 20:45:25 1.4 @@ -1,4 +1,4 @@ -# $Id: smeserver-ejabberd.spec,v 1.2 2008/05/21 20:10:23 snetram Exp $ +# $Id: smeserver-ejabberd.spec,v 1.3 2008/05/22 18:44:09 gnujpl 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 3 +%define release 4 Version: %{version} Release: %{release}%{?dist} @@ -15,6 +15,7 @@ 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch BuildRequires: e-smith-devtools >= 1.7.5 @@ -23,6 +24,10 @@ Obsoletes: e-smith-jabber AutoReqProv: no %changelog +* Sun Jun 22 2008 Jean-Paul Leclere 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 2.0.0-3 - no more use /opt - use SME server ssl certs @@ -78,6 +83,7 @@ exit 0 %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build perl createlinks @@ -91,6 +97,7 @@ 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)' \ @@ -108,6 +115,7 @@ rm -f %{name}-%{version}-%{release}-file rm -rf $RPM_BUILD_ROOT %post +mkdir -p /var/service/ejabberd/ssl %postun