[packages/ejabberd] 'paths' patches merged and updated

[jajcus]

commit 9a6073b0a82f0356c3c97a4ecaf387361b0a22b8
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Thu Nov 14 22:10:11 2013 +0100

    'paths' patches merged and updated

 ejabberd-makefile.patch                            | 13 ------------
 ejabberd-inetrc_path.patch => ejabberd-paths.patch | 24 +++++++++++++++++++---
 ejabberd.init                                      |  2 +-
 ejabberd.spec                                      |  4 +---
 4 files changed, 23 insertions(+), 20 deletions(-)
---
diff --git a/ejabberd.spec b/ejabberd.spec
index 3858523..eecbf7b 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -53,12 +53,11 @@ Source23:	ejabberd-p1_pgsql-20130515.tar.gz
 Source24:	ejabberd-p1_stun-20130624.tar.gz
 # Source24-md5:	9a1c5ad9b3b95364d3f76446fcf58dc3
 #
-Patch0:		%{realname}-makefile.patch
+Patch0:		%{realname}-paths.patch
 # not available for 13.10
 #Patch1:		%{realname}-vcard-access-get.patch
 # http://www.dp.uz.gov.ua/o.palij/mod_logdb/patch-mod_logdb-2.1.12.diff
 Patch2:		%{realname}-mod_logdb.patch
-Patch3:		%{realname}-inetrc_path.patch
 URL:		http://www.ejabberd.im/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -106,7 +105,6 @@ Server-side logging module.
 %if %{with logdb}
 %patch2 -p0
 %endif
-%patch3 -p1
 
 # do not let it use 'git describe' to fetch version
 # it uses nonsense during manual builds and fails on the builder
diff --git a/ejabberd-makefile.patch b/ejabberd-makefile.patch
deleted file mode 100644
index e651140..0000000
--- a/ejabberd-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -dur ejabberd-13.10.orig/Makefile.in ejabberd-13.10/Makefile.in
---- ejabberd-13.10.orig/Makefile.in	2013-09-27 11:19:22.000000000 +0200
-+++ ejabberd-13.10/Makefile.in	2013-11-14 09:23:06.000000000 +0100
-@@ -9,7 +9,7 @@
- DESTDIR =
- 
- # /etc/ejabberd/
--ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
-+ETCDIR = $(DESTDIR)@sysconfdir@/jabber
- 
- # /sbin/
- SBINDIR = $(DESTDIR)@sbindir@
-Only in ejabberd-13.10: Makefile.in~
diff --git a/ejabberd-inetrc_path.patch b/ejabberd-paths.patch
similarity index 57%
rename from ejabberd-inetrc_path.patch
rename to ejabberd-paths.patch
index bd4a7a6..8cd46a9 100644
--- a/ejabberd-inetrc_path.patch
+++ b/ejabberd-paths.patch
@@ -1,6 +1,15 @@
 diff -dur -x '*~' ejabberd-13.10.orig/Makefile.in ejabberd-13.10/Makefile.in
---- ejabberd-13.10.orig/Makefile.in	2013-11-14 20:21:37.000000000 +0100
-+++ ejabberd-13.10/Makefile.in	2013-11-14 20:30:48.745590816 +0100
+--- ejabberd-13.10.orig/Makefile.in	2013-09-27 11:19:22.000000000 +0200
++++ ejabberd-13.10/Makefile.in	2013-11-14 22:08:25.461196174 +0100
+@@ -9,7 +9,7 @@
+ DESTDIR =
+ 
+ # /etc/ejabberd/
+-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
++ETCDIR = $(DESTDIR)@sysconfdir@/jabber
+ 
+ # /sbin/
+ SBINDIR = $(DESTDIR)@sbindir@
 @@ -123,7 +123,7 @@
  	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
  		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
@@ -12,7 +21,16 @@ diff -dur -x '*~' ejabberd-13.10.orig/Makefile.in ejabberd-13.10/Makefile.in
  	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
 diff -dur -x '*~' ejabberd-13.10.orig/ejabberdctl.template ejabberd-13.10/ejabberdctl.template
 --- ejabberd-13.10.orig/ejabberdctl.template	2013-09-27 11:19:22.000000000 +0200
-+++ ejabberd-13.10/ejabberdctl.template	2013-11-14 20:27:04.240688181 +0100
++++ ejabberd-13.10/ejabberdctl.template	2013-11-14 22:08:57.068093561 +0100
+@@ -56,7 +56,7 @@
+ 
+ # Define ejabberd variable if they have not been defined from the command line
+ if [ "$ETCDIR" = "" ] ; then
+-    ETCDIR={{sysconfdir}}/ejabberd
++    ETCDIR={{sysconfdir}}/jabber
+ fi
+ if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; then
+     EJABBERDCTL_CONFIG_PATH=$ETCDIR/ejabberdctl.cfg
 @@ -104,7 +104,7 @@
  SASL_LOG_PATH=$LOGS_DIR/erlang.log
  DATETIME=`date "+%Y%m%d-%H%M%S"`
diff --git a/ejabberd.init b/ejabberd.init
index f4060c4..4b655d1 100644
--- a/ejabberd.init
+++ b/ejabberd.init
@@ -21,7 +21,7 @@ export EJABBERD_DOC_PATH EJABBERD_PID_PATH
 start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/ejabberd ]; then
-		msg_starting ejabberd
+		msg_starting ejabberd ; busy
 		/usr/sbin/ejabberdctl start
 		RETVAL=$?
 		if [ $RETVAL -eq 0 ]; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ejabberd.git/commitdiff/9a6073b0a82f0356c3c97a4ecaf387361b0a22b8