rpms/ejabberd/devel ejabberd.spec,1.22,1.23

[Peter Lemenkov (peter)]

Author: peter

Update of /cvs/extras/rpms/ejabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19878/devel

Modified Files:
	ejabberd.spec 
Log Message:
Fixed BZ# 439583


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ejabberd.spec	24 May 2008 18:16:55 -0000	1.22
+++ ejabberd.spec	29 May 2008 14:41:20 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -129,9 +129,18 @@
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 cp -p %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
 
-%{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
+%{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g'  %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
 %{__perl} -pi -e 's!\@version\@!%{version}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
 
+# BZ# 439583
+%{__perl} -pi -e 's!ROOTDIR=\/usr!ROOTDIR=!g' %{buildroot}%{_sbindir}/ejabberdctl
+%{__perl} -pi -e 's!/var/lib/ejabberd/db/\$NODE!/var/lib/ejabberd/spool!g' %{buildroot}%{_sbindir}/ejabberdctl
+%{__perl} -pi -e 's!/var/lib/ejabberd/ebin!%{_libdir}/ejabberd/ebin!g' %{buildroot}%{_sbindir}/ejabberdctl
+%{__perl} -pi -e 's!/var/lib/ejabberd/priv/msgs!%{_libdir}/ejabberd/priv/msgs!g' %{buildroot}%{_sbindir}/ejabberdctl
+%{__perl} -pi -e 's!/var/lib/ejabberd/priv/lib!%{_libdir}/ejabberd/priv/lib!g' %{buildroot}%{_sbindir}/ejabberdctl
+%{__perl} -pi -e 's!/var/lib/ejabberd/priv/bin!%{_libdir}/ejabberd/priv/bin!g' %{buildroot}%{_sbindir}/ejabberdctl
+%{__perl} -pi -e 's!HOME=\$ROOTDIR/var/lib/ejabberd!HOME=%{_libdir}/ejabberd!g' %{buildroot}%{_sbindir}/ejabberdctl
+
 %clean
 rm -rf %{buildroot}
 
@@ -177,6 +186,9 @@
 %endif
 
 %changelog
+* Thu May 29 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-2
+- Fixed BZ# 439583
+
 * Sat May 24 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-1
 - Ver. 2.0.1
 - Upstreamed patches dropped