packages: wordpress/wordpress.spec, wordpress/phpmailer.patch (NEW) - use s...
glen
glen at pld-linux.org
Thu Sep 9 17:57:56 CEST 2010
Author: glen Date: Thu Sep 9 15:57:56 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use system phpmailer, drop json compat
---- Files affected:
packages/wordpress:
wordpress.spec (1.71 -> 1.72) , phpmailer.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/wordpress/wordpress.spec
diff -u packages/wordpress/wordpress.spec:1.71 packages/wordpress/wordpress.spec:1.72
--- packages/wordpress/wordpress.spec:1.71 Thu Sep 9 17:32:41 2010
+++ packages/wordpress/wordpress.spec Thu Sep 9 17:57:51 2010
@@ -8,7 +8,7 @@
Summary(pl.UTF-8): Osobisty system publikacji
Name: wordpress
Version: 3.0.1
-Release: 0.13
+Release: 0.14
License: GPL v2
Group: Applications/Publishing
Source0: http://wordpress.org/%{name}-%{version}.tar.gz
@@ -29,6 +29,7 @@
Patch4: pear-text-diff.patch
Patch5: atomlib.patch
Patch6: swfobject.patch
+Patch7: phpmailer.patch
URL: http://www.wordpress.org/
BuildRequires: gettext-devel
BuildRequires: rpm-php-pearprov
@@ -46,6 +47,7 @@
Requires: php-mysql
Requires: php-pcre
Requires: php-pear-Text_Diff
+Requires: php-phpmailer >= 2.0.4
Requires: php-simplepie >= 1.2
Requires: php-spl
Requires: php-tokenizer
@@ -170,6 +172,13 @@
# system atomlib
rm wp-includes/atomlib.php
+# system phpmailer
+rm wp-includes/class-phpmailer.php
+rm wp-includes/class-smtp.php
+
+# php 5.2 + json ext satisfies this compat
+rm wp-includes/class-json.php
+
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
%build
@@ -288,6 +297,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.72 2010/09/09 15:57:51 glen
+- use system phpmailer, drop json compat
+
Revision 1.71 2010/09/09 15:32:41 glen
- update path to swfobject to use global alias
================================================================
Index: packages/wordpress/phpmailer.patch
diff -u /dev/null packages/wordpress/phpmailer.patch:1.1
--- /dev/null Thu Sep 9 17:57:56 2010
+++ packages/wordpress/phpmailer.patch Thu Sep 9 17:57:51 2010
@@ -0,0 +1,12 @@
+--- wordpress/wp-includes/pluggable.php~ 2010-09-09 16:45:23.000000000 +0300
++++ wordpress/wp-includes/pluggable.php 2010-09-09 18:51:10.849503438 +0300
+@@ -279,8 +279,7 @@
+
+ // (Re)create it, if it's gone missing
+ if ( !is_object( $phpmailer ) || !is_a( $phpmailer, 'PHPMailer' ) ) {
+- require_once ABSPATH . WPINC . '/class-phpmailer.php';
+- require_once ABSPATH . WPINC . '/class-smtp.php';
++ require_once 'class.phpmailer.php';
+ $phpmailer = new PHPMailer();
+ }
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wordpress/wordpress.spec?r1=1.71&r2=1.72&f=u
More information about the pld-cvs-commit
mailing list