From 2b65bbec9d7e3b61f0907a5b48727ce483857b82 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: May 29 2008 14:49:21 +0000 Subject: Fixed BZ# 439583 --- diff --git a/ejabberd.spec b/ejabberd.spec index 696be79..fc97f0f 100644 --- a/ejabberd.spec +++ b/ejabberd.spec @@ -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 @@ chmod a+x %{buildroot}%{_initrddir}/ejabberd 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 @@ rm -rf %{buildroot} %endif %changelog +* Thu May 29 2008 Peter Lemenkov 2.0.1-2 +- Fixed BZ# 439583 + * Sat May 24 2008 Peter Lemenkov 2.0.1-1 - Ver. 2.0.1 - Upstreamed patches dropped