SPECS (AC-branch): ejabberd.spec - version 1.1.0 - backport from HEAD

[deejay1]

Author: deejay1                      Date: Wed Apr 26 16:55:56 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- version 1.1.0
- backport from HEAD

---- Files affected:
SPECS:
   ejabberd.spec (1.18 -> 1.18.2.1) 

---- Diffs:

================================================================
Index: SPECS/ejabberd.spec
diff -u SPECS/ejabberd.spec:1.18 SPECS/ejabberd.spec:1.18.2.1
--- SPECS/ejabberd.spec:1.18	Fri Dec 16 15:59:24 2005
+++ SPECS/ejabberd.spec	Wed Apr 26 18:55:50 2006
@@ -2,12 +2,12 @@
 Summary:	Fault-tolerant distributed Jabber/XMPP server
 Summary(pl):	Odporny na awarie rozproszony serwer Jabbera/XMPP
 Name:		ejabberd
-Version:	1.0.0
+Version:	1.1.0
 Release:	1
 License:	GPL
 Group:		Applications/Communications
 Source0:	http://www.process-one.net/en/projects/ejabberd/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	bc0bfdad2e5e48e42fcc5d09384be74f
+# Source0-md5:	abd310557da32e520c4a3d4f3c97aab1
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.sh
@@ -21,8 +21,10 @@
 BuildRequires:	erlang >= R9C
 BuildRequires:	expat-devel >= 1.95
 BuildRequires:	openssl-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post):	/usr/bin/perl
-Requires(post): jabber-common
+Requires(post):	jabber-common
+Requires(post):	sed >= 4.0
 Requires(post):	textutils
 Requires(post,preun):	/sbin/chkconfig
 Requires:	erlang
@@ -46,7 +48,8 @@
 %build
 cd src
 %{__autoconf}
-%configure
+%configure \
+	--enable-odbc
 %{__make}
 cd ..
 
@@ -68,39 +71,33 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /etc/jabber/secret ] ; then
-	SECRET=`cat /etc/jabber/secret`
+if [ -f %{_sysconfdir}/jabber/secret ] ; then
+	SECRET=`cat %{_sysconfdir}/jabber/secret`
 	if [ -n "$SECRET" ] ; then
 		echo "Updating component authentication secret in ejabberd config file..."
-		perl -pi -e "s/>secret</$SECRET/" /etc/jabber/ejabberd.cfg
+		%{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/ejabberd.cfg
 	fi
 fi
 
-if [ ! -f /etc/jabber/cookie ] ; then
-        echo "Generating erl authentication cookie..."
-        umask 066
-        perl -e 'open R,"/dev/urandom"; read R,$r,16;
-                printf "%02x",ord(chop $r) while($r);' > /etc/jabber/cookie
+if [ ! -f %{_sysconfdir}/jabber/cookie ] ; then
+	echo "Generating erl authentication cookie..."
+	umask 066
+	perl -e 'open R,"/dev/urandom"; read R,$r,16;
+		printf "%02x",ord(chop $r) while($r);' > %{_sysconfdir}/jabber/cookie
 fi
 
 /sbin/chkconfig --add ejabberd
-if [ -r /var/lock/subsys/ejabberd ]; then
-	/etc/rc.d/init.d/ejabberd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/ejabberd start\" to start ejabberd server."
-fi
+%service ejabberd restart "ejabberd server"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -r /var/lock/subsys/ejabberd ]; then
-		/etc/rc.d/init.d/ejabberd stop >&2
-	fi
+	%service ejabberd stop
 	/sbin/chkconfig --del ejabberd
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog doc
+%doc ChangeLog doc src/odbc/pg.sql
 %attr(755,root,root) %{_sbindir}/*
 %attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/*
 %attr(770,root,jabber) /var/log/ejabberd
@@ -115,6 +112,22 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18.2.1  2006/04/26 16:55:50  deejay1
+- version 1.1.0
+- backport from HEAD
+
+Revision 1.22  2006/04/26 09:33:06  jajcus
+- Version: 1.1.0
+
+Revision 1.21  2006/04/14 17:42:16  glen
+- use sed for inline edits rather perl
+
+Revision 1.20  2006/04/07 17:59:05  jajcus
+- enable ODBC
+
+Revision 1.19  2006/02/27 23:00:10  glen
+- use %service
+
 Revision 1.18  2005/12/16 14:59:24  deejay1
 - higher erlang BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ejabberd.spec?r1=1.18&r2=1.18.2.1&f=u