packages: phorum/phorum.spec, phorum/sys-recaptcha.patch (NEW) - use system...

[glen]

Author: glen                         Date: Wed Jan 13 20:37:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system recaptcha lib

---- Files affected:
packages/phorum:
   phorum.spec (1.35 -> 1.36) , sys-recaptcha.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/phorum/phorum.spec
diff -u packages/phorum/phorum.spec:1.35 packages/phorum/phorum.spec:1.36
--- packages/phorum/phorum.spec:1.35	Wed Jan 13 21:22:23 2010
+++ packages/phorum/phorum.spec	Wed Jan 13 21:37:15 2010
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Phorum - implementacja forum WWW w PHP
 Name:		phorum
 Version:	%{themever}.14
-Release:	0.32
+Release:	0.33
 License:	Apache-like
 Group:		Applications/WWW
 Source0:	http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
@@ -14,6 +14,7 @@
 Patch1:		mysql.patch
 Patch2:		docsurl.patch
 Patch3:		sys-phpmailer.patch
+Patch4:		sys-recaptcha.patch
 URL:		http://www.phorum.org/
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{name}(theme) = %{themever}
@@ -142,6 +143,7 @@
 Summary:	Phorum Spam Hurdle Module
 Group:		Applications/WWW
 Requires:	%{name} = %{version}-%{release}
+Requires:	php-recaptcha
 
 %description mod-spamhurdles
 This module sets up some hurdles for forum spammers. It implements
@@ -208,6 +210,10 @@
 # php-phpmailer
 rm -rf mods/smtp_mail/phpmailer
 
+# php-recaptcha
+rm -rf mods/spamhurdles/captcha/recaptcha-php-1.9
+rm -f mods/spamhurdles/MANIFEST
+
 mv include/db/config.php.sample .
 mv include/api/examples examples/api
 mv docs/example_mods examples/mods
@@ -263,6 +269,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -493,6 +500,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2010/01/13 20:37:15  glen
+- use system recaptcha lib
+
 Revision 1.35  2010/01/13 20:22:23  glen
 - lang tags for mods
 

================================================================
Index: packages/phorum/sys-recaptcha.patch
diff -u /dev/null packages/phorum/sys-recaptcha.patch:1.1
--- /dev/null	Wed Jan 13 21:37:20 2010
+++ packages/phorum/sys-recaptcha.patch	Wed Jan 13 21:37:15 2010
@@ -0,0 +1,11 @@
+--- phorum/mods/spamhurdles/captcha/class.captcha_recaptcha.php~	2010-01-13 22:21:20.000000000 +0200
++++ phorum/mods/spamhurdles/captcha/class.captcha_recaptcha.php	2010-01-13 22:35:22.516978432 +0200
+@@ -11,7 +11,7 @@
+ // we might implement the configuration as a part of the CAPTCHA class.
+ // For now, this setup will do just fine.
+ 
+-define('RECAPTCHA_LIB', './mods/spamhurdles/captcha/recaptcha-php-1.9/recaptchalib.php');
++define('RECAPTCHA_LIB', '/usr/share/php/recaptchalib.php');
+ 
+ class captcha_recaptcha
+ {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum.spec?r1=1.35&r2=1.36&f=u