packages: wpmu/wpmu.spec, wpmu/pear-text-diff.patch (NEW) - use pear Text_Diff

[glen]

Author: glen                         Date: Thu May 20 10:09:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use pear Text_Diff

---- Files affected:
packages/wpmu:
   wpmu.spec (1.26 -> 1.27) , pear-text-diff.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wpmu/wpmu.spec
diff -u packages/wpmu/wpmu.spec:1.26 packages/wpmu/wpmu.spec:1.27
--- packages/wpmu/wpmu.spec:1.26	Thu May 20 11:54:04 2010
+++ packages/wpmu/wpmu.spec	Thu May 20 12:09:31 2010
@@ -10,7 +10,7 @@
 Summary(en.UTF-8):	WordPress µ
 Name:		wpmu
 Version:	2.9.2
-Release:	1.2
+Release:	1.3
 License:	GPL v2
 Group:		Applications/Publishing
 Source0:	http://mu.wordpress.org/wordpress-mu-%{version}.tar.gz
@@ -25,6 +25,7 @@
 Patch2:		configpath.patch
 Patch3:		simplepie.patch
 Patch4:		rss_post_author.patch
+Patch5:		pear-text-diff.patch
 BuildRequires:	/usr/bin/php
 BuildRequires:	rpm-php-pearprov
 Requires:	js-swfobject >= 2.1
@@ -32,6 +33,7 @@
 Requires:	php-gettext
 Requires:	php-mysql
 Requires:	php-pcre
+Requires:	php-pear-Text_Diff
 Requires:	php-simplepie >= 1.2
 Requires:	php-xml
 Requires:	webapps
@@ -140,6 +142,10 @@
 # system simplepie
 rm wp-includes/class-simplepie.php
 
+# system php-pear-Text_Diff
+rm -rf wp-includes/Text/Diff*
+rmdir wp-includes/Text
+
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -150,6 +156,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -267,6 +274,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2010/05/20 10:09:31  glen
+- use pear Text_Diff
+
 Revision 1.26  2010/05/20 09:54:04  glen
 - fix rss import bug where author is set to 1 not author value
 

================================================================
Index: packages/wpmu/pear-text-diff.patch
diff -u /dev/null packages/wpmu/pear-text-diff.patch:1.1
--- /dev/null	Thu May 20 12:09:37 2010
+++ packages/wpmu/pear-text-diff.patch	Thu May 20 12:09:31 2010
@@ -0,0 +1,17 @@
+--- wpmu/wp-includes/wp-diff.php	2010-04-14 16:12:46.000000000 +0300
++++ wpmu/wp-includes/wp-diff.php	2010-05-20 12:48:55.452984888 +0300
+@@ -10,11 +10,11 @@
+ 
+ if ( !class_exists( 'Text_Diff' ) ) {
+ 	/** Text_Diff class */
+-	require( dirname(__FILE__).'/Text/Diff.php' );
++	require_once 'Text/Diff.php';
+ 	/** Text_Diff_Renderer class */
+-	require( dirname(__FILE__).'/Text/Diff/Renderer.php' );
++	require_once 'Text/Diff/Renderer.php';
+ 	/** Text_Diff_Renderer_inline class */
+-	require( dirname(__FILE__).'/Text/Diff/Renderer/inline.php' );
++	require_once 'Text/Diff/Renderer/inline.php';
+ }
+ 
+ /**
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu/wpmu.spec?r1=1.26&r2=1.27&f=u