rpms/ejabberd/devel ejabberd-ejabberdctl_fix.diff, 1.4, 1.5 ejabberd.spec, 1.30, 1.31 import.log, 1.5, 1.6

[Peter Lemenkov]

Author: peter

Update of /cvs/extras/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3688/devel

Modified Files:
	ejabberd-ejabberdctl_fix.diff ejabberd.spec import.log 
Log Message:
Fixed BZ# 465196

ejabberd-ejabberdctl_fix.diff:

Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ejabberd-ejabberdctl_fix.diff	29 Aug 2008 20:16:17 -0000	1.4
+++ ejabberd-ejabberdctl_fix.diff	2 Oct 2008 05:28:56 -0000	1.5
@@ -1,5 +1,5 @@
---- src/ejabberdctl.template.fix_user	2008-08-01 16:34:28.000000000 +0400
-+++ src/ejabberdctl.template	2008-08-09 16:04:56.000000000 +0400
+--- src/ejabberdctl.template.fix_user	2008-08-27 13:37:52.000000000 +0400
++++ src/ejabberdctl.template	2008-10-02 09:24:52.000000000 +0400
 @@ -9,13 +9,14 @@
  
  # define default environment variables
@@ -33,12 +33,12 @@
  EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
  SASL_LOG_PATH=$LOGS_DIR/sasl.log
  DATETIME=`date "+%Y%m%d-%H%M%S"`
-@@ -139,11 +140,14 @@
+@@ -139,11 +140,13 @@
  # common control function
  ctl ()
  {
-+    $ERL_COMMAND=" \ 
-     $ERL \
+-    $ERL \
++    ERL_COMMAND="$ERL \
        $NAME ejabberdctl \
        -noinput \
        -pa $EJABBERD_EBIN \


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ejabberd.spec	30 Aug 2008 18:38:24 -0000	1.30
+++ ejabberd.spec	2 Oct 2008 05:28:56 -0000	1.31
@@ -1,12 +1,12 @@
 Name:           ejabberd
 Version:        2.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.ejabberd.im/
-Source0:	http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source0:        http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1:        ejabberd.init
 Source2:        ejabberd.logrotate
 
@@ -18,13 +18,15 @@
 Source5:        ejabberd_auth_ad.erl
 Source6:        mod_shared_roster_ad.erl
 Source7:        mod_vcard_ad.erl
+
+# PAM support
 Source9:        ejabberdctl.pam
 Source10:       ejabberdctl.apps
 Source11:       ejabberd.pam
 
 # Fedora-specific stuff - fixing paths
 Patch1: ejabberd-build.patch
-# BZ# 439583, 452326, 451554
+# BZ# 439583, 452326, 451554, 465196
 Patch2: ejabberd-ejabberdctl_fix.diff
 # Use ejabberd as an example for PAM service name
 Patch3: ejabberd-ejabberd_cfg_pam_name.diff
@@ -209,6 +211,9 @@
 %endif
 
 %changelog
+* Thu Oct  2 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.2-3
+- Fixed broken ejabberdctl (BZ# 465196)
+
 * Sat Aug 30 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.2-2
 - Added missing Requires
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	29 Aug 2008 20:16:17 -0000	1.5
+++ import.log	2 Oct 2008 05:28:56 -0000	1.6
@@ -3,3 +3,4 @@
 ejabberd-2_0_2-0_1_beta1_fc9:HEAD:ejabberd-2.0.2-0.1.beta1.fc9.src.rpm:1218295749
 ejabberd-2_0_2-0_3_beta1_fc9:HEAD:ejabberd-2.0.2-0.3.beta1.fc9.src.rpm:1218350775
 ejabberd-2_0_2-1_fc9:HEAD:ejabberd-2.0.2-1.fc9.src.rpm:1220040866
+ejabberd-2_0_2-3_fc9:HEAD:ejabberd-2.0.2-3.fc9.src.rpm:1222925272