rpms/ejabberd/devel ejabberd.spec,1.37,1.38 import.log,1.10,1.11

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9528/devel

Modified Files:
	ejabberd.spec import.log 
Log Message:
Enable CAPTCHA plugin


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ejabberd.spec	4 Apr 2009 04:32:29 -0000	1.37
+++ ejabberd.spec	21 Apr 2009 09:03:57 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -35,7 +35,6 @@
 # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
 Patch4: ejabberd-captcha.patch
 
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
@@ -117,7 +116,7 @@
 %patch1 -p0 -b .fix_paths
 %patch2 -p0 -b .fix_user
 %patch3 -p0 -b .pam_name
-#%patch4 -p1 -b .captcha
+%patch4 -p1 -b .captcha
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -177,8 +176,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
-# tools/captcha.sh
+%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -220,6 +218,9 @@
 %endif
 
 %changelog
+* Tue Apr 21 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-3
+- CAPTCHA is back - let's test it.
+
 * Sat Apr  4 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-2
 - Really disable CAPTCHA
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	4 Apr 2009 04:32:29 -0000	1.10
+++ import.log	21 Apr 2009 09:03:57 -0000	1.11
@@ -8,3 +8,4 @@
 ejabberd-2_0_4-1_fc10:HEAD:ejabberd-2.0.4-1.fc10.src.rpm:1237116778
 ejabberd-2_0_5-1_fc10:HEAD:ejabberd-2.0.5-1.fc10.src.rpm:1238789339
 ejabberd-2_0_5-2_fc10:HEAD:ejabberd-2.0.5-2.fc10.src.rpm:1238819481
+ejabberd-2_0_5-3_fc10:HEAD:ejabberd-2.0.5-3.fc10.src.rpm:1240304532