Author: glen Date: Mon Jan 18 10:05:28 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rename to wpmu
---- Files affected:
packages/wpmu:
apache.conf (1.2 -> 1.3) , configpath.patch (1.2 -> 1.3) , lighttpd.conf
(1.1 -> 1.2) , pld.patch (1.4 -> 1.5) , wpmu.spec (1.9 -> 1.10)
---- Diffs:
================================================================
Index: packages/wpmu/apache.conf
diff -u packages/wpmu/apache.conf:1.2 packages/wpmu/apache.conf:1.3
--- packages/wpmu/apache.conf:1.2 Fri Nov 20 18:37:21 2009
+++ packages/wpmu/apache.conf Mon Jan 18 11:05:22 2010
@@ -1,5 +1,5 @@
-Alias /wpmu /usr/share/wordpress-mu
-<Directory /usr/share/wordpress-mu>
+Alias /wpmu /usr/share/wpmu
+<Directory /usr/share/wpmu>
Allow from all
Options +FollowSymLinks
================================================================
Index: packages/wpmu/configpath.patch
diff -u packages/wpmu/configpath.patch:1.2 packages/wpmu/configpath.patch:1.3
--- packages/wpmu/configpath.patch:1.2 Mon Dec 7 21:57:22 2009
+++ packages/wpmu/configpath.patch Mon Jan 18 11:05:22 2010
@@ -4,7 +4,7 @@
define('ABSPATH', dirname(dirname(__FILE__)).'/');
define('WPINC', 'wp-includes');
define('WP_CONTENT_DIR', ABSPATH . 'wp-content');
-+define('WP_CONFIG_DIR', '/etc/webapps/wordpress-mu/');
++define('WP_CONFIG_DIR', '/etc/webapps/wpmu/');
/*...@-*/
require_once(ABSPATH . WPINC . '/compat.php');
@@ -45,7 +45,7 @@
printheader();
- $handle = fopen('wp-config.php', 'w');
-+ $handle = fopen('/etc/webapps/wordpress-mu/wp-config.php', 'w');
++ $handle = fopen('/etc/webapps/wpmu/wp-config.php', 'w');
foreach ($wp_config_file as $line) {
switch ( trim( substr($line,0,16) ) ) {
@@ -62,7 +62,7 @@
// Install Blog!
- include_once('./wp-config.php');
-+ include_once('/etc/webapps/wordpress-mu/wp-config.php');
++ include_once('/etc/webapps/wpmu/wp-config.php');
include_once('./wp-admin/includes/upgrade.php');
$_SERVER[ 'HTTP_HOST' ] = str_replace( 'www.', '', $_SERVER[
'HTTP_HOST' ] ); // normalise hostname - no www.
@@ -84,7 +84,7 @@
if ( !isset($wp_did_header) ) {
// WPMU Runs installer if things aren't set up correctly
- if ( !file_exists( dirname(__FILE__) . '/wp-config.php') &&
!file_exists( dirname( dirname(__FILE__) ) . '/wp-config.php')) {
-+ if (!filesize('/etc/webapps/wordpress-mu/wp-config.php') &&
++ if (!filesize('/etc/webapps/wpmu/wp-config.php') &&
+ !file_exists( dirname(__FILE__) . '/wp-config.php') &&
!file_exists( dirname( dirname(__FILE__) ) . '/wp-config.php')) {
if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path =
'';
else $path = 'wp-admin/';
@@ -95,7 +95,7 @@
/** Define ABSPATH as this files directory */
define( 'ABSPATH', dirname(__FILE__) . '/' );
-+define( 'WP_CONFIG_DIR', '/etc/webapps/wordpress-mu/' );
++define( 'WP_CONFIG_DIR', '/etc/webapps/wpmu/' );
if ( defined('E_RECOVERABLE_ERROR') )
error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR |
E_USER_WARNING | E_RECOVERABLE_ERROR);
================================================================
Index: packages/wpmu/lighttpd.conf
diff -u packages/wpmu/lighttpd.conf:1.1 packages/wpmu/lighttpd.conf:1.2
--- packages/wpmu/lighttpd.conf:1.1 Thu Nov 19 13:37:14 2009
+++ packages/wpmu/lighttpd.conf Mon Jan 18 11:05:22 2010
@@ -1,3 +1,3 @@
alias.url += (
- "/wpmu" => "/usr/share/wordpress-mu",
+ "/wpmu" => "/usr/share/wpmu",
)
================================================================
Index: packages/wpmu/pld.patch
diff -u packages/wpmu/pld.patch:1.4 packages/wpmu/pld.patch:1.5
--- packages/wpmu/pld.patch:1.4 Thu Nov 19 16:31:35 2009
+++ packages/wpmu/pld.patch Mon Jan 18 11:05:22 2010
@@ -55,7 +55,7 @@
+ if (include("index-install.php")) {
+ exit;
+ }
-+ die('Please install <code>wordpress-mu-setup</code> package to
run install wizard');
++ die('Please install <code>wpmu-setup</code> package to run
install wizard');
}
$wp_did_header = true;
================================================================
Index: packages/wpmu/wpmu.spec
diff -u packages/wpmu/wpmu.spec:1.9 packages/wpmu/wpmu.spec:1.10
--- packages/wpmu/wpmu.spec:1.9 Mon Dec 7 21:57:22 2009
+++ packages/wpmu/wpmu.spec Mon Jan 18 11:05:22 2010
@@ -3,12 +3,12 @@
# - gettext mo to system dir, add all possible languages?
Summary: WordPress MU
Summary(en.UTF-8): WordPress µ
-Name: wordpress-mu
+Name: wpmu
Version: 2.8.6
-Release: 0.36
+Release: 0.38
License: GPL
Group: Applications/Publishing
-Source0: http://mu.wordpress.org/%{name}-%{version}.tar.gz
+Source0: http://mu.wordpress.org/wordpress-mu-%{version}.tar.gz
# Source0-md5: dfa27af33afe0c206933e509edd5835c
URL: http://mu.wordpress.org/
Source1: apache.conf
@@ -24,6 +24,7 @@
Requires: php-xmlrpc
Requires: webapps
Requires: webserver(php) >= 5.0
+Obsoletes: wordpress-mu
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -46,6 +47,7 @@
Summary(pl.UTF-8): Pakiet do wstępnej konfiguracji Wordpress
Group: Applications/WWW
Requires: %{name} = %{version}-%{release}
+Obsoletes: wordpress-mu-setup
%description setup
Install this package to configure initial WordPress MU installation.
@@ -64,7 +66,7 @@
%prep
%setup -qc
-mv %{name}/* .; rmdir %{name}
+mv wordpress-mu/* .; rmdir wordpress-mu
# undos
find '(' -name '*.php' -o -name '*.js' -o -name '*.html' ')' -print0 | xargs
-0 %{__sed} -i -e 's,\r$,,'
@@ -190,6 +192,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.10 2010/01/18 10:05:22 glen
+- rename to wpmu
+
Revision 1.9 2009/12/07 20:57:22 glen
- update blogs.dir usage
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu/apache.conf?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu/configpath.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu/lighttpd.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu/pld.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu/wpmu.spec?r1=1.9&r2=1.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
