packages: wordpress-mu/wordpress-mu.spec, wordpress-mu/wp_queries.patch (NE...

[glen]

Author: glen                         Date: Thu Nov 26 19:19:39 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- hack to make possible to switch blog_ids (import script for example)

---- Files affected:
packages/wordpress-mu:
   wordpress-mu.spec (1.6 -> 1.7) , wp_queries.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wordpress-mu/wordpress-mu.spec
diff -u packages/wordpress-mu/wordpress-mu.spec:1.6 packages/wordpress-mu/wordpress-mu.spec:1.7
--- packages/wordpress-mu/wordpress-mu.spec:1.6	Fri Nov 20 18:37:28 2009
+++ packages/wordpress-mu/wordpress-mu.spec	Thu Nov 26 20:19:34 2009
@@ -5,7 +5,7 @@
 Summary(en.UTF-8):	WordPress µ
 Name:		wordpress-mu
 Version:	2.8.6
-Release:	0.25
+Release:	0.29
 License:	GPL
 Group:		Applications/Publishing
 Source0:	http://mu.wordpress.org/%{name}-%{version}.tar.gz
@@ -13,7 +13,9 @@
 URL:		http://mu.wordpress.org/
 Source1:	apache.conf
 Patch0:		pld.patch
+Patch1:		wp_queries.patch
 Source2:	lighttpd.conf
+BuildRequires:	/usr/bin/php
 Requires:	php-gettext
 Requires:	php-mysql
 Requires:	php-pcre
@@ -72,10 +74,20 @@
 rm wp-content/mu-plugins/readme.txt
 rm wp-content/plugins/index.php
 rm wp-content/plugins/readme.txt
+rm wp-content/index.php
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
+# Extract $wp_queries to separate file so these could be re-loaded when blog changes
+sed -ne '/global $wp_queries;/,/WP_FIRST_INSTALL$/p' wp-admin/includes/schema.php > wp-admin/includes/schema-wp_queries.php
+sed -i -e '/global $wp_queries;/,/WP_FIRST_INSTALL$/d' wp-admin/includes/schema.php
+%patch1 -p1
+
+%build
+php -l wp-admin/includes/schema.php
+php -l wp-admin/includes/schema-wp_queries.php
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_appdir},%{_sbindir},%{_sysconfdir},%{_appdir}/wp-content/{languages,blogs.dir}}
@@ -147,7 +159,6 @@
 %dir %{_appdir}
 %{_appdir}/*.php
 %{_appdir}/wp-includes
-%{_appdir}/wp-content/index.php
 %dir %{_appdir}/wp-content
 %dir %{_appdir}/wp-content/languages
 %dir %{_appdir}/wp-content/plugins
@@ -181,6 +192,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2009/11/26 19:19:34  glen
+- hack to make possible to switch blog_ids (import script for example)
+
 Revision 1.6  2009/11/20 17:37:28  glen
 - package blogs.dir
 

================================================================
Index: packages/wordpress-mu/wp_queries.patch
diff -u /dev/null packages/wordpress-mu/wp_queries.patch:1.1
--- /dev/null	Thu Nov 26 20:19:39 2009
+++ packages/wordpress-mu/wp_queries.patch	Thu Nov 26 20:19:34 2009
@@ -0,0 +1,38 @@
+--- wordpress-mu-2.8.6/wp-admin/includes/schema.php~	2009-11-26 21:08:55.000000000 +0200
++++ wordpress-mu-2.8.6/wp-admin/includes/schema.php	2009-11-26 21:09:06.521250085 +0200
+@@ -8,6 +8,7 @@
+  * @subpackage Administration
+  */
+ 
++include 'schema-wp_queries.php';
+ 
+ /**
+  * Create WordPress options and set the default values.
+--- wordpress-mu-2.8.6/wp-includes/wpmu-functions.php	2009-11-26 17:05:15.285399614 +0200
++++ wordpress-mu-2.8.6/wp-includes/wpmu-functions.php	2009-11-26 21:10:40.890795853 +0200
+@@ -1391,6 +1391,9 @@
+ 
+ 	require_once( ABSPATH . 'wp-admin/includes/upgrade.php');
+ 
++	// we need to load wp_queries no matter what in case blog has been switched meanwhile
++	require( ABSPATH . 'wp-admin/includes/schema-wp_queries.php');
++
+ 	if ( $wpdb->get_results("SELECT ID FROM $wpdb->posts") ) 
+ 		die(__('<h1>Already Installed</h1><p>You appear to have already installed WordPress. To reinstall please clear your old database tables first.</p>') . '</body></html>');
+ 	$wpdb->suppress_errors( false);
+--- wordpress-mu-2.8.6/wp-admin/includes/schema-wp_queries.php~	2009-11-26 21:14:25.000000000 +0200
++++ wordpress-mu-2.8.6/wp-admin/includes/schema-wp_queries.php	2009-11-26 21:15:17.503892089 +0200
+@@ -1,3 +1,13 @@
++<?php
++/**
++ * WordPress Administration Scheme API
++ *
++ * Here we keep the DB structure and option values.
++ *
++ * @package WordPress
++ * @subpackage Administration
++ */
++
+ global $wp_queries;
+ 
+ /**
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wordpress-mu/wordpress-mu.spec?r1=1.6&r2=1.7&f=u