rpms/ejabberd/devel .cvsignore, 1.5, 1.6 ejabberd.spec, 1.14, 1.15 sources, 1.5, 1.6

[Matej Cepl (mcepl)]

Author: mcepl

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

Modified Files:
	.cvsignore ejabberd.spec sources 
Log Message:
New build with new ssl library and erlang.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Sep 2007 13:04:12 -0000	1.5
+++ .cvsignore	11 Dec 2007 16:30:26 -0000	1.6
@@ -1 +1 @@
-ejabberd-1.1.4.tar.gz
+ejab-446.patch


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ejabberd.spec	5 Sep 2007 13:04:12 -0000	1.14
+++ ejabberd.spec	11 Dec 2007 16:30:26 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        1.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -23,6 +23,10 @@
 Source9:        ejabberdctl.pam
 Source10:       ejabberdctl.apps
 
+# originally from
+# https://support.process-one.net/secure/attachment/11788/ejab-446.patch
+Patch0: ejab-446.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -76,6 +80,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .Er12b-build 
 
 %{__perl} -pi -e "s!/var/lib/ejabberd!%{_libdir}/ejabberd-%{version}!g" src/Makefile.in
 %{__perl} -pi -e "s!/etc!%{_sysconfdir}!g" src/Makefile.in
@@ -88,7 +93,7 @@
 
 %build
 pushd src
-%configure --enable-odbc
+%configure --enable-odbc --enable-debug
 make %{?_smp_mflags}
 popd
 pushd doc
@@ -169,6 +174,11 @@
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Tue Dec 11 2007 Matej Cepl <mcepl at redhat.com> 1.1.4-2.fc9
+- rebuild against new ssl library.
+- rebuild against the newest erlang (see Patch
+- fix %%changelog
+
 * Wed Sep  5 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.4-1
 - Drop LDAP patch
 - Update mod_ctlextra
@@ -229,8 +239,8 @@
 
 * Thu Jun 22 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-6
 - Split documentation off to a subpackage.
-- Own %{_libdir}/ejabberd-%{version}
-- Mark %{_sysconfdir}/logrotate.d/ejabberd as %config
+- Own %%{_libdir}/ejabberd-%{version}
+- Mark %%{_sysconfdir}/logrotate.d/ejabberd as %%config
 
 * Thu Jun  8 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.1-5
 - Patch the makefile so that it adds a soname to shared libs.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Sep 2007 13:04:12 -0000	1.5
+++ sources	11 Dec 2007 16:30:26 -0000	1.6
@@ -1 +1 @@
-65e9cd346f11a28afbacfe1d7be3a33b  ejabberd-1.1.4.tar.gz
+37fd8c5183818f6ce36f4e3dd64e5033  ejab-446.patch