--- rpms/smeserver-ejabberd/contribs7/smeserver-ejabberd.spec 2008/05/15 17:16:30 1.1 +++ rpms/smeserver-ejabberd/contribs7/smeserver-ejabberd.spec 2009/04/27 16:11:20 1.19 @@ -1,29 +1,87 @@ -# $Id$ +# $Id: smeserver-ejabberd.spec,v 1.18 2009/03/03 21:36:58 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 1 +%define version 2.0.1 +%define release 11 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz +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 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 -%package debug -Group: Networking/Daemons -Summary: smeserver-ejabberd debug package - %changelog +* Mon Apr 27 2009 SME Translation Server 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 2.0.1-9 +- Apply 1 Mar 2009 locale patch [SME: 5018] + +* Sat Jan 31 2009 Jonathan Martens 2.0.1-8 +- Apply 31 Jan 2009 locale patch [SME: 4951] + +* Thu Jan 1 2009 Jonathan Martens 2.0.1-7 +- Apply 1 Jan 2009 locale patch [SME: 4900] + +* Sun Nov 30 2008 Jonathan Martens 2.0.1-6 +- Apply 30 Nov 2008 locale patch + +* Wed Nov 19 2008 Jonathan Martens 2.0.1-5 +- Apply 19 Nov 2008 locale patch + +* Thu Oct 16 2008 Jonathan Martens 2.0.1-4 +- Apply 16 Oct 2008 locale patch + +* Tue Oct 14 2008 Jonathan Martens 2.0.1-3 +- Apply 14 Oct 2008 locale patch + +* Tue Jul 1 2008 Jonathan Martens 2.0.1-2 +- 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 +- Added missing dependency on e-smith-formmagick >= 1.4.0-12 + +* 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 +- db migrate process + +* Thu May 21 2008 Jonathan Martens 2.0.0-2 +- Apply 21 May 2008 locale patch + * Wed May 14 2008 Jean-Paul Leclere 2.0.0-1 - bump to ejabberd 2.0.0 - no more contains ejabberd Process-One binary installer (due to GPL violation) @@ -52,18 +110,33 @@ 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 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 %build perl createlinks @@ -77,24 +150,21 @@ 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)' \ - | egrep -v '^/opt/ejabberd/(database/ejabberd/|conf/ejabberd.cfg)' > %{name}-%{version}-%{release}-filelist + > %{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 +mkdir -p /var/service/ejabberd/ssl %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)