rpms/ejabberd/devel .cvsignore, 1.8, 1.9 ejabberd-build.patch, 1.1, 1.2 ejabberd.init, 1.4, 1.5 ejabberd.logrotate, 1.2, 1.3 ejabberd.spec, 1.21, 1.22 sources, 1.10, 1.11 ejab-446.patch, 1.2, NONE ejabberd-ssl.patch, 1.1, NONE

Sat May 24 18:17:45 UTC 2008

Author: peter

Update of /cvs/extras/rpms/ejabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24713/devel

Modified Files:
	.cvsignore ejabberd-build.patch ejabberd.init 
	ejabberd.logrotate ejabberd.spec sources 
Removed Files:
	ejab-446.patch ejabberd-ssl.patch 
Log Message:
Ver. 2.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9

--- .cvsignore	23 Feb 2008 07:37:47 -0000	1.8
+++ .cvsignore	24 May 2008 18:16:55 -0000	1.9
@@ -1 +1 @@
-ejabberd-2.0.0.tar.gz
+ejabberd-2.0.1_2.tar.gz

ejabberd-build.patch:

Index: ejabberd-build.patch
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberd-build.patch	23 Jan 2008 19:12:15 -0000	1.1
+++ ejabberd-build.patch	24 May 2008 18:16:55 -0000	1.2
@@ -1,12 +1,11 @@
-diff -up ejabberd-2.0.0-beta1/src/Makefile.in.MC-build ejabberd-2.0.0-beta1/src/Makefile.in
---- ejabberd-2.0.0-beta1/src/Makefile.in.MC-build	2007-12-24 15:33:44.000000000 +0100
-+++ ejabberd-2.0.0-beta1/src/Makefile.in	2007-12-26 18:58:29.000000000 +0100
-@@ -55,7 +55,7 @@ SODIR = $(PRIVDIR)/lib
- MSGSDIR = $(PRIVDIR)/msgs
- LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd
- ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd
--SBINDIR = $(DESTDIR)@prefix@/sbin
-+SBINDIR = $(DESTDIR)@prefix@/usr/sbin
+--- src/Makefile.in~	2008-05-23 14:59:01.000000000 +0400
++++ src/Makefile.in	2008-05-23 16:27:42.000000000 +0400
+@@ -56,7 +56,7 @@
  
- ifeq ($(shell uname),Darwin)
- DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
+ DESTDIR =
+ 
+-EJABBERDDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
++EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
+ BEAMDIR = $(EJABBERDDIR)/ebin
+ PRIVDIR = $(EJABBERDDIR)/priv
+ SODIR = $(PRIVDIR)/lib


Index: ejabberd.init
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ejabberd.init	23 Jan 2008 19:12:15 -0000	1.4
+++ ejabberd.init	24 May 2008 18:16:55 -0000	1.5
@@ -22,7 +22,7 @@
 start() {
         echo -n $"Starting ejabberd: "
         daemon --user=ejabberd --check=ejabberd \
-	    "erl" "-pa @libdir@/ejabberd- at version@/ebin \
+	    "erl" "-pa @libdir@/ejabberd/ebin \
                    -sname ejabberd \
                    -s ejabberd \
                    -ejabberd config \\\"/etc/ejabberd/ejabberd.cfg\\\" \
@@ -40,7 +40,7 @@
 stop() {
         # Stop daemons.
         echo -n "Shutting down ejabberd: "
-        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node stop" && success || failure
+        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node stop" && success || failure
         RETVAL=$?
         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ejabberd
         echo
@@ -74,7 +74,7 @@
         [ -f /var/lock/subsys/ejabberd ] && restart || :
         ;;
   status)
-        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status"
+        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status"
         ;;
   *)
         echo "Usage: ejabberd {start|stop|restart|force-reload|condrestart|try-restart|status}"


Index: ejabberd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ejabberd.logrotate	11 Oct 2006 20:33:59 -0000	1.2
+++ ejabberd.logrotate	24 May 2008 18:16:55 -0000	1.3
@@ -4,6 +4,6 @@
     create 0640 ejabberd ejabberd
     sharedscripts
     postrotate
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
+        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
     endscript
 }


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ejabberd.spec	23 Feb 2008 07:37:47 -0000	1.21
+++ ejabberd.spec	24 May 2008 18:16:55 -0000	1.22
@@ -1,12 +1,12 @@
 Name:           ejabberd
-Version:        2.0.0
+Version:        2.0.1
 Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
-License:        GPLv2
+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}_2.tar.gz
 Source1:        ejabberd.init
 Source2:        ejabberd.logrotate
 
@@ -22,22 +22,19 @@
 Source9:        ejabberdctl.pam
 Source10:       ejabberdctl.apps
 
-# originally from
-# https://support.process-one.net/secure/attachment/11788/ejab-446.patch
-Patch0: ejab-446.patch
-
-# local stuff
+# Fedora-specific stuff - fixing paths
 Patch1: ejabberd-build.patch
 
-# R12B
-Patch2: ejabberd-ssl.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
 BuildRequires:  openssl-devel
+BuildRequires:  pam-devel
 BuildRequires:  erlang
+BuildRequires:	dos2unix
+%if %{undefined rhel}
 BuildRequires:  hevea
+%endif
 
 Requires:       erlang
 Requires:       usermode
@@ -85,13 +82,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .Er12b-build 
-%patch1 -p1 -b .MC-build
-#%patch2 -p1 -b .R12B
-
-%{__perl} -pi -e "s!/var/lib/ejabberd!%{_libdir}/ejabberd-%{version}!g" src/Makefile.in
-%{__perl} -pi -e "s!/etc!%{_sysconfdir}!g" src/Makefile.in
-%{__perl} -pi -e "s!\@prefix\@!!g" src/Makefile.in
+%patch1 -p0 -b .fix_paths
+dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
 cp %{S:5} src
@@ -101,11 +93,14 @@
 %build
 pushd src
 %configure --enable-odbc --enable-debug
-make %{?_smp_mflags}
+# doesn't builds on SMP currently
+make
 popd
+%if %{undefined rhel}
 pushd doc
 make html pdf
 popd
+%endif
 
 %install
 rm -rf %{buildroot}
@@ -114,7 +109,7 @@
 make install DESTDIR=%{buildroot}
 popd
 
-chmod a+x %{buildroot}%{_libdir}/ejabberd-%{version}/priv/lib/*.so
+chmod a+x %{buildroot}%{_libdir}/%{name}/priv/lib/*.so
 
 %{__perl} -pi -e 's!./ssl.pem!/etc/ejabberd/ejabberd.pem!g' %{buildroot}/etc/ejabberd/ejabberd.cfg
 
@@ -137,15 +132,12 @@
 %{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
 %{__perl} -pi -e 's!\@version\@!%{version}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
 
-#cp %{S:3} %{buildroot}%{_sysconfdir}/ejabberd/inetrc
-#mv %{buildroot}%{_sysconfdir}/ejabberd/{ejabberd.,}inetrc
-
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -160,29 +152,43 @@
 %{_bindir}/ejabberdctl
 %{_sbindir}/ejabberdctl
 
-%dir %{_libdir}/ejabberd-%{version}
-%dir %{_libdir}/ejabberd-%{version}/ebin
-%{_libdir}/ejabberd-%{version}/ebin/*.app
-%{_libdir}/ejabberd-%{version}/ebin/*.beam
-
-%dir %{_libdir}/ejabberd-%{version}/priv
-
-%dir %{_libdir}/ejabberd-%{version}/priv/lib
-%{_libdir}/ejabberd-%{version}/priv/lib/*.so
-
-%dir %{_libdir}/ejabberd-%{version}/priv/msgs
-%{_libdir}/ejabberd-%{version}/priv/msgs/*.msg
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/ebin
+%dir %{_libdir}/%{name}/priv
+%dir %{_libdir}/%{name}/priv/bin
+%dir %{_libdir}/%{name}/priv/lib
+%dir %{_libdir}/%{name}/priv/msgs
+
+%{_libdir}/%{name}/ebin/*.app
+%{_libdir}/%{name}/ebin/*.beam
+%{_libdir}/%{name}/priv/lib/*.so
+%{_libdir}/%{name}/priv/msgs/*.msg
 
 %attr(750,ejabberd,ejabberd) %dir /var/lib/ejabberd
 %attr(750,ejabberd,ejabberd) %dir /var/lib/ejabberd/spool
-
 %attr(750,ejabberd,ejabberd) %dir /var/log/ejabberd
 
 %files doc
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
+%if %{undefined rhel}
+%doc ChangeLog COPYING doc/release_notes_* doc/*.pdf doc/*.html doc/*.png
+%else
+%doc ChangeLog COPYING doc/release_notes_*
+%endif
 
 %changelog
+* Sat May 24 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-1
+- Ver. 2.0.1
+- Upstreamed patches dropped
+- No longer uses versioned libdir (/usr/lib/ejabberd-x.x.x)
+- Added sql-scripts in docs-directory
+
+* Mon May  5 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.0-3
+- Fix build against R11B-2
+
+* Sat Feb 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.0-2
+- Disable docs again for EPEL (we haven't hevea for EPEL)
+
 * Sat Feb 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.0-1
 - Version 2.0.0
 
@@ -194,7 +200,7 @@
 
 * Wed Jan 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.0-0.2.rc1
 - Enabled some previously disabled modules
- 
+
 * Sat Jan 19 2008 Matej Cepl <mcepl at redhat.com> 2.0.0-0.1.rc1
 - Upgrade to the current upsteram version.
 - Make ejabberd.init LSB compliant (missing Provides: tag)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	23 Feb 2008 07:37:47 -0000	1.10
+++ sources	24 May 2008 18:16:55 -0000	1.11
@@ -1 +1 @@
-93b21f2fa0ca6074bd22ab924e7dced8  ejabberd-2.0.0.tar.gz
+9c9417ab8dc334094ec7a611016c726e  ejabberd-2.0.1_2.tar.gz


--- ejab-446.patch DELETED ---


--- ejabberd-ssl.patch DELETED ---


