[rpms/ejabberd] f45: Enable CAPTCHA plugin

[rpms/ejabberd] f45: Enable CAPTCHA plugin

[Peter Lemenkov]

A new commit has been pushed.

Repo   : rpms/ejabberd
Branch : f45
Commit : 555acbc0a9837a50026430b22f48c31ec0255ff5
Author : Peter Lemenkov <peter@fedoraproject.org>
Date   : 2009-04-21T09:03:57+00:00
Stats  : +7/-5 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ejabberd/c/555acbc0a9837a50026430b22f48c31ec0255ff5?branch=f45

Log:
Enable CAPTCHA plugin

---
diff --git a/ejabberd.spec b/ejabberd.spec
index 968f7ea..f8e0325 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -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 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.diff
 # 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 @@ fi
 %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 @@ rm -rf %{buildroot}
 
 %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 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Apr 21 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.5-3
+- CAPTCHA is back - let's test it.
+
 * Sat Apr  4 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.5-2
 - Really disable CAPTCHA
 

diff --git a/import.log b/import.log
index de28b7d..1b9bfa3 100644
--- a/import.log
+++ b/import.log
@@ -8,3 +8,4 @@ ejabberd-2_0_3-1_fc10:HEAD:ejabberd-2.0.3-1.fc10.src.rpm:1232988133
 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