rpms/ejabberd/EL-5 ejabberd-ejabberdctl_fix.diff, 1.1, 1.2 ejabberd.init, 1.5, 1.6 ejabberd.spec, 1.19, 1.20 import.log, 1.1, 1.2

[Peter Lemenkov (peter)]

Author: peter

Update of /cvs/extras/rpms/ejabberd/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10991/EL-5

Modified Files:
	ejabberd-ejabberdctl_fix.diff ejabberd.init ejabberd.spec 
	import.log 
Log Message:
last munute fix (issue with shortname/fqdn)

ejabberd-ejabberdctl_fix.diff:

Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/EL-5/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberd-ejabberdctl_fix.diff	22 Jun 2008 16:19:11 -0000	1.1
+++ ejabberd-ejabberdctl_fix.diff	22 Jun 2008 19:14:52 -0000	1.2
@@ -5,7 +5,7 @@
  # define default environment variables
  NODE=ejabberd
 -HOST=localhost
-+HOST=`hostname | cut -d. -f1`
++HOST=`hostname -s`
  ERLANG_NODE=$NODE@$HOST
 -ROOTDIR=@rootdir@
 +ROOTDIR=


Index: ejabberd.init
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/EL-5/ejabberd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ejabberd.init	24 May 2008 17:50:18 -0000	1.5
+++ ejabberd.init	22 Jun 2008 19:14:52 -0000	1.6
@@ -17,7 +17,7 @@
 
 . /etc/rc.d/init.d/functions
 
-node=`hostname | cut -d. -f1`
+node=`hostname -s`
 
 start() {
         echo -n $"Starting ejabberd: "


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/EL-5/ejabberd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ejabberd.spec	22 Jun 2008 16:19:11 -0000	1.19
+++ ejabberd.spec	22 Jun 2008 19:14:52 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -183,6 +183,9 @@
 %endif
 
 %changelog
+* Sun Jun 22 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-4
+- Last minute fix (issue with shortnames/fqdn)
+
 * Sun Jun 22 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3
 -Fixed BZ# 439583, 452326, 451554
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Jun 2008 16:19:11 -0000	1.1
+++ import.log	22 Jun 2008 19:14:52 -0000	1.2
@@ -1 +1,2 @@
 ejabberd-2_0_1-3_fc9:EL-5:ejabberd-2.0.1-3.fc9.src.rpm:1214151359
+ejabberd-2_0_1-4_fc9:EL-5:ejabberd-2.0.1-4.fc9.src.rpm:1214161435