packages: wpmu/wpmu.spec, wpmu/simplepie.patch (NEW) - use system simplepie

[glen]

Author: glen                         Date: Thu May 20 09:53:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system simplepie

---- Files affected:
packages/wpmu:
   wpmu.spec (1.24 -> 1.25) , simplepie.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wpmu/wpmu.spec
diff -u packages/wpmu/wpmu.spec:1.24 packages/wpmu/wpmu.spec:1.25
--- packages/wpmu/wpmu.spec:1.24	Thu May 20 11:52:42 2010
+++ packages/wpmu/wpmu.spec	Thu May 20 11:53:24 2010
@@ -23,6 +23,7 @@
 Patch0:		pld.patch
 Patch1:		wp_queries.patch
 Patch2:		configpath.patch
+Patch3:		simplepie.patch
 BuildRequires:	/usr/bin/php
 BuildRequires:	rpm-php-pearprov
 Requires:	js-swfobject >= 2.1
@@ -30,6 +31,7 @@
 Requires:	php-gettext
 Requires:	php-mysql
 Requires:	php-pcre
+Requires:	php-simplepie >= 1.2
 Requires:	php-xml
 Requires:	webapps
 Requires:	webserver(php)
@@ -134,6 +136,9 @@
 # system swfobject
 rm wp-includes/js/swfobject.js
 
+# system simplepie
+rm wp-includes/class-simplepie.php
+
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -142,6 +147,7 @@
 sed -i -e '/global $wp_queries;/,/WP_FIRST_INSTALL$/d' wp-admin/includes/schema.php
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -259,6 +265,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2010/05/20 09:53:24  glen
+- use system simplepie
+
 Revision 1.24  2010/05/20 09:52:42  glen
 - update path to debug log if enabled
 

================================================================
Index: packages/wpmu/simplepie.patch
diff -u /dev/null packages/wpmu/simplepie.patch:1.1
--- /dev/null	Thu May 20 11:53:30 2010
+++ packages/wpmu/simplepie.patch	Thu May 20 11:53:24 2010
@@ -0,0 +1,18 @@
+--- wpmu-2.9.2/./wp-includes/class-feed.php~	2010-05-14 18:04:07.000000000 +0300
++++ wpmu-2.9.2/./wp-includes/class-feed.php	2010-05-19 17:07:27.696746340 +0300
+@@ -1,7 +1,7 @@
+ <?php
+ 
+ if ( !class_exists('SimplePie') )
+-	require_once (ABSPATH . WPINC . '/class-simplepie.php');
++	require_once 'simplepie.inc'
+ 
+ class WP_Feed_Cache extends SimplePie_Cache {
+ 	/**
+@@ -100,4 +100,4 @@
+ 			}
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}
================================================================

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