- updated for ejabberd-1.0.0

[packages/ejabberd.git] / ejabberd.spec

diff --git a/ejabberd.spec b/ejabberd.spec
index 1e4a267e1b47f4c7ad11ef47ebf45070855ad795..f828727ad4baac28c2f869bab2dad21114b51ee2 100644 (file)
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,28 +1,31 @@
 Summary:       Fault-tolerant distributed Jabber/XMPP server
 Summary(pl):   Odporny na awarie rozproszony serwer Jabbera/XMPP
 Name:          ejabberd
-Version:       0.7
-Release:       0.5
+Version:       0.9.8
+Release:       2
 License:       GPL
 Group:         Applications/Communications
-Source0:       http://www.jabberstudio.org/files/ejabberd/%{name}-%{version}.tar.gz
-# Source0-md5: dfec9573263de8729213993f015cfac9
+Source0:       http://www.process-one.net/en/projects/ejabberd/download/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 3270317c66d5df46e20f0ed65cc44f39
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.sh
 Source4:       %{name}ctl.sh
+Source5:       %{name}-inetrc
 Patch0:                %{name}-makefile.patch
 Patch1:                %{name}-config.patch
+Patch3:                %{name}-mod_muc.patch
 URL:           http://ejabberd.jabberstudio.org/
 BuildRequires: autoconf
 BuildRequires: erlang >= R8B
-BuildRequires: expat >= 1.95
-PreReq:                rc-scripts
+BuildRequires: expat-devel >= 1.95
+BuildRequires: openssl-devel
+Requires(post):        /usr/bin/perl
 Requires(post): jabber-common
 Requires(post):        textutils
-Requires(post):        /usr/bin/perl
 Requires(post,preun):  /sbin/chkconfig
 Requires:      erlang
+Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,6 +40,7 @@ rozproszony serwer Jabbera. Jest napisany w wi
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch3 -p1
 
 %build
 cd src
@@ -50,13 +54,14 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/var/lib/%{name},/etc/{sysconfig,rc.d/init.d},%{_sbindir}}
 
 %{__make} -C src install \
-       DESTDIR=$RPM_BUILD_ROOT 
+       DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+sed -e's,@libdir@,%{_libdir},g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
-install %{SOURCE3} $RPM_BUILD_ROOT/%{_sbindir}/%{name}
-install %{SOURCE4} $RPM_BUILD_ROOT/%{_sbindir}/%{name}ctl
+sed -e's,@libdir@,%{_libdir},g' %{SOURCE3} > $RPM_BUILD_ROOT/%{_sbindir}/%{name}
+sed -e's,@libdir@,%{_libdir},g' %{SOURCE4} > $RPM_BUILD_ROOT/%{_sbindir}/%{name}ctl
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/jabber
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,10 +71,17 @@ if [ -f /etc/jabber/secret ] ; then
        SECRET=`cat /etc/jabber/secret`
        if [ -n "$SECRET" ] ; then
                echo "Updating component authentication secret in ejabberd config file..."
-               perl -pi -e "s/>secret</>$SECRET</" /etc/jabber/ejabberd.cfg
+               perl -pi -e "s/>secret</$SECRET/" /etc/jabber/ejabberd.cfg
        fi
 fi
 
+if [ ! -f /etc/jabber/cookie ] ; then
+        echo "Generating erl authentication cookie..."
+        umask 066
+        perl -e 'open R,"/dev/urandom"; read R,$r,16;
+                printf "%02x",ord(chop $r) while($r);' > /etc/jabber/cookie
+fi
+
 /sbin/chkconfig --add ejabberd
 if [ -r /var/lock/subsys/ejabberd ]; then
        /etc/rc.d/init.d/ejabberd restart >&2
@@ -87,11 +99,11 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog TODO doc
+%doc ChangeLog doc
 %attr(755,root,root) %{_sbindir}/*
-%attr(640,root,jabber) %config(noreplace) %verify(not md5 size mtime) /etc/jabber/*
+%attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/*
 %attr(770,root,jabber) /var/log/ejabberd
 %{_libdir}/ejabberd
 %dir %attr(770,root,jabber) /var/lib/ejabberd
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/%{name}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}