[rpms/ejabberd] f45: last munute fix (issue with shortname/fqdn)

[rpms/ejabberd] f45: last munute fix (issue with shortname/fqdn)

[Peter Lemenkov]

A new commit has been pushed.

Repo   : rpms/ejabberd
Branch : f45
Commit : 3aa9165342cbfa7ea95d646e49253686a5423264
Author : Peter Lemenkov <peter@fedoraproject.org>
Date   : 2008-06-22T18:56:07+00:00
Stats  : +7/-3 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/ejabberd/c/3aa9165342cbfa7ea95d646e49253686a5423264?branch=f45

Log:
last munute fix (issue with shortname/fqdn)

---
diff --git a/ejabberd-ejabberdctl_fix.diff b/ejabberd-ejabberdctl_fix.diff
index 31c2ee0..cde410f 100644
--- a/ejabberd-ejabberdctl_fix.diff
+++ b/ejabberd-ejabberdctl_fix.diff
@@ -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=

diff --git a/ejabberd.init b/ejabberd.init
index 7866893..3ef3548 100644
--- a/ejabberd.init
+++ b/ejabberd.init
@@ -17,7 +17,7 @@
 
 . /etc/rc.d/init.d/functions
 
-node=`hostname | cut -d. -f1`
+node=`hostname -s`
 
 start() {
         echo -n $"Starting ejabberd: "

diff --git a/ejabberd.spec b/ejabberd.spec
index c3250c6..40ca073 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -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 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sun Jun 22 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.1-4
+- Last minute fix (issue with shortnames/fqdn)
+
 * Sun Jun 22 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.1-3
 -Fixed BZ# 439583, 452326, 451554
 

diff --git a/import.log b/import.log
index e5c42c7..95482f4 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 ejabberd-2_0_1-3_fc9:HEAD:ejabberd-2.0.1-3.fc9.src.rpm:1214150816
+ejabberd-2_0_1-4_fc9:HEAD:ejabberd-2.0.1-4.fc9.src.rpm:1214160895