rpms/mediawiki/F-11 mediawiki-1.15.0-commoncode.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 mediawiki.spec, 1.30, 1.31 sources, 1.21, 1.22 mediawiki-1.14.0-commoncode.patch, 1.1, NONE
athimm
athimm at fedoraproject.org
Sat Jul 11 20:38:16 UTC 2009
- Previous message (by thread): rpms/mediawiki/devel mediawiki-1.15.0-commoncode.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 mediawiki.spec, 1.31, 1.32 sources, 1.21, 1.22 mediawiki-1.14.0-commoncode.patch, 1.1, NONE
- Next message (by thread): rpms/mysql/F-10 mysql-bug-44348.patch, NONE, 1.1 mysql.spec, 1.111, 1.112
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: athimm
Update of /cvs/extras/rpms/mediawiki/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26767/F-11
Modified Files:
.cvsignore mediawiki.spec sources
Added Files:
mediawiki-1.15.0-commoncode.patch
Removed Files:
mediawiki-1.14.0-commoncode.patch
Log Message:
Update to 1.15.0, fix api.php access.
mediawiki-1.15.0-commoncode.patch:
--- NEW FILE mediawiki-1.15.0-commoncode.patch ---
--- mediawiki-1.15.0//includes/Setup.php.commoncode 2009-01-27 20:58:26.000000000 +0100
+++ mediawiki-1.15.0//includes/Setup.php 2009-07-11 21:46:03.000000000 +0200
@@ -45,7 +45,7 @@
if( $wgLogo === false ) $wgLogo = "$wgStylePath/common/images/wiki.png";
if( $wgUploadPath === false ) $wgUploadPath = "$wgScriptPath/images";
-if( $wgUploadDirectory === false ) $wgUploadDirectory = "$IP/images";
+if( $wgUploadDirectory === false ) $wgUploadDirectory = "$DIR/images";
if( $wgMathPath === false ) $wgMathPath = "{$wgUploadPath}/math";
if( $wgMathDirectory === false ) $wgMathDirectory = "{$wgUploadDirectory}/math";
--- mediawiki-1.15.0//includes/WebStart.php.commoncode 2008-11-07 17:38:01.000000000 +0100
+++ mediawiki-1.15.0//includes/WebStart.php 2009-07-11 21:46:03.000000000 +0200
@@ -103,14 +103,14 @@
# LocalSettings.php is the per site customization file. If it does not exit
# the wiki installer need to be launched or the generated file moved from
# ./config/ to ./
- if( !file_exists( "$IP/LocalSettings.php" ) ) {
+ if( !file_exists( "$DIR/LocalSettings.php" ) ) {
require_once( "$IP/includes/DefaultSettings.php" ); # used for printing the version
require_once( "$IP/includes/templates/NoLocalSettings.php" );
die();
}
# Include site settings. $IP may be changed (hopefully before the AutoLoader is invoked)
- require_once( "$IP/LocalSettings.php" );
+ require_once( "$DIR/LocalSettings.php" );
}
wfProfileOut( 'WebStart.php-conf' );
--- mediawiki-1.15.0//includes/templates/NoLocalSettings.php.commoncode 2009-02-20 14:56:57.000000000 +0100
+++ mediawiki-1.15.0//includes/templates/NoLocalSettings.php 2009-07-11 21:46:03.000000000 +0200
@@ -58,7 +58,7 @@
<h1>MediaWiki <?php echo htmlspecialchars( $wgVersion ) ?></h1>
<div class='error'>
<?php
- if ( file_exists( 'config/LocalSettings.php' ) ) {
+ if ( file_exists( $DIR . 'config/LocalSettings.php' ) ) {
echo( 'To complete the installation, move <tt>config/LocalSettings.php</tt> to the parent directory.' );
} else {
echo( "Please <a href=\"" . htmlspecialchars( $path ) . "config/index." . htmlspecialchars( $ext ) . "\" title='setup'> set up the wiki</a> first." );
--- mediawiki-1.15.0//maintenance/archives/upgradeWatchlist.php.commoncode 2008-07-11 00:00:04.000000000 +0200
+++ mediawiki-1.15.0//maintenance/archives/upgradeWatchlist.php 2009-07-11 21:46:03.000000000 +0200
@@ -15,7 +15,7 @@
# Convert watchlists to new format
global $IP;
-require_once( "../LocalSettings.php" );
+require_once( "$DIR/LocalSettings.php" );
require_once( "$IP/Setup.php" );
$wgTitle = Title::newFromText( "Rebuild links script" );
--- mediawiki-1.15.0//maintenance/commandLine.inc.commoncode 2009-02-23 13:37:33.000000000 +0100
+++ mediawiki-1.15.0//maintenance/commandLine.inc 2009-07-11 21:46:03.000000000 +0200
@@ -6,6 +6,8 @@
* @defgroup Maintenance Maintenance
*/
+$DIR=getcwd();
+
$wgRequestTime = microtime(true);
/** */
@@ -175,7 +177,7 @@
if ( isset( $options['conf'] ) ) {
$settingsFile = $options['conf'];
} else {
- $settingsFile = "$IP/LocalSettings.php";
+ $settingsFile = "$DIR/LocalSettings.php";
}
if ( isset( $options['wiki'] ) ) {
$bits = explode( '-', $options['wiki'] );
@@ -201,7 +203,7 @@
$adminSettings = isset( $options['aconf'] )
? $options['aconf']
- : "{$IP}/AdminSettings.php";
+ : "{$DIR}/AdminSettings.php";
if( is_readable( $adminSettings ) )
require_once( $adminSettings );
--- mediawiki-1.15.0//maintenance/update.php.commoncode 2008-07-19 14:15:07.000000000 +0200
+++ mediawiki-1.15.0//maintenance/update.php 2009-07-11 21:46:03.000000000 +0200
@@ -10,6 +10,9 @@
* @ingroup Maintenance
*/
+$DIR=getcwd();
+chdir('/usr/share/mediawiki');
+
/** */
$wgUseMasterForMaintenance = true;
$options = array( 'quick', 'nopurge' );
--- mediawiki-1.15.0//config/index.php.commoncode 2009-05-08 07:51:15.000000000 +0200
+++ mediawiki-1.15.0//config/index.php 2009-07-11 21:46:03.000000000 +0200
@@ -19,6 +19,9 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# http://www.gnu.org/copyleft/gpl.html
+$DIR=dirname( getcwd() );
+chdir('/usr/share/mediawiki/config');
+
error_reporting( E_ALL );
header( "Content-type: text/html; charset=utf-8" );
@ini_set( "display_errors", true );
@@ -27,7 +30,7 @@
$wgRequestTime = microtime( true );
# Attempt to set up the include path, to fix problems with relative includes
-$IP = dirname( dirname( __FILE__ ) );
+$IP = '/usr/share/mediawiki';
define( 'MW_INSTALL_PATH', $IP );
# Define an entry point and include some files
@@ -218,18 +221,18 @@
/* Check for existing configurations and bug out! */
-if( file_exists( "../LocalSettings.php" ) ) {
+if( file_exists( "$DIR/LocalSettings.php" ) ) {
$script = defined('MW_INSTALL_PHP5_EXT') ? 'index.php5' : 'index.php';
dieout( "<p><strong>Setup has completed, <a href='../$script'>your wiki</a> is configured.</strong></p>
<p>Please delete the /config directory for extra security.</p>" );
}
-if( file_exists( "./LocalSettings.php" ) ) {
+if( file_exists( "$DIR/LocalSettings.php" ) ) {
writeSuccessMessage();
dieout( '' );
}
-if( !is_writable( "." ) ) {
+if( !is_writable( $DIR . "/config" ) ) {
dieout( "<h2>Can't write config file, aborting</h2>
<p>In order to configure the wiki you have to make the <tt>config</tt> subdirectory
@@ -1213,7 +1216,7 @@
$localSettings = "<" . "?php$endl$local";
// Fix up a common line-ending problem (due to CVS on Windows)
$localSettings = str_replace( "\r\n", "\n", $localSettings );
- $f = fopen( "LocalSettings.php", 'xt' );
+ $f = fopen( $DIR . "/config/LocalSettings.php", 'xt' );
if( $f == false ) {
print( "</li>\n" );
@@ -1776,7 +1779,7 @@
if( defined( 'MW_INSTALL_PATH' ) ) {
\$IP = MW_INSTALL_PATH;
} else {
- \$IP = dirname( __FILE__ );
+ \$IP = '/usr/share/mediawiki';
}
\$path = array( \$IP, \"\$IP/includes\", \"\$IP/languages\" );
--- mediawiki-1.15.0//index.php.commoncode 2009-03-20 13:00:38.000000000 +0100
+++ mediawiki-1.15.0//index.php 2009-07-11 21:46:03.000000000 +0200
@@ -36,9 +36,11 @@
* @file
*/
+$DIR=getcwd();
+chdir('/usr/share/mediawiki');
# Initialise common code
-$preIP = dirname( __FILE__ );
+$preIP = '/usr/share/mediawiki';
require_once( "$preIP/includes/WebStart.php" );
# Initialize MediaWiki base class
--- mediawiki-1.15.0//api.php.commoncode 2009-05-05 16:07:59.000000000 +0200
+++ mediawiki-1.15.0//api.php 2009-07-11 21:46:03.000000000 +0200
@@ -34,8 +34,11 @@
* in the URL.
*/
+$DIR=getcwd();
+chdir('/usr/share/mediawiki');
+
// Initialise common code
-require (dirname(__FILE__) . '/includes/WebStart.php');
+require ('/usr/share/mediawiki' . '/includes/WebStart.php');
wfProfileIn('api.php');
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore 28 Feb 2009 18:33:26 -0000 1.20
+++ .cvsignore 11 Jul 2009 20:37:45 -0000 1.21
@@ -1 +1 @@
-mediawiki-1.14.0.tar.gz
+mediawiki-1.15.0.tar.gz
Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/F-11/mediawiki.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- mediawiki.spec 28 Feb 2009 18:33:26 -0000 1.30
+++ mediawiki.spec 11 Jul 2009 20:37:45 -0000 1.31
@@ -1,13 +1,14 @@
Summary: A wiki engine
Name: mediawiki
-Version: 1.14.0
-Release: 45%{?dist}
+Version: 1.15.0
+Release: 47%{?dist}
License: GPLv2+
Group: Development/Tools
URL: http://www.mediawiki.org/
-Source0: http://download.wikimedia.org/mediawiki/1.14/%{name}-%{version}.tar.gz
-Patch0: mediawiki-1.14.0-commoncode.patch
+Source0: http://download.wikimedia.org/mediawiki/1.15/%{name}-%{version}.tar.gz
+Patch0: mediawiki-1.15.0-commoncode.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+ExcludeArch: sparc64 s390 s390x
BuildRequires: ocaml >= 3.06
# to make sure the "apache" group is created before mediawiki is installed
Requires(pre): httpd
@@ -87,6 +88,7 @@ cd %{buildroot}/var/www/wiki/
mkdir -p images/{archive,deleted,temp,thumb}
cp -a %{buildroot}%{_datadir}/mediawiki/config .
ln -s %{_datadir}/mediawiki/index.php index.php
+ln -s %{_datadir}/mediawiki/api.php api.php
%clean
rm -rf %{buildroot}
@@ -111,6 +113,16 @@ rm -rf %{buildroot}
%changelog
+* Sat Jul 11 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.15.0-47
+- Fix api.php breakage.
+
+* Sat Jun 13 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.15.0-46
+- Update to 1.15.0.
+
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+ (added sparc64 per request from the sparc maintainer)
+
* Sat Feb 28 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.14.0-45
- Update to 1.14.0.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources 28 Feb 2009 18:33:26 -0000 1.21
+++ sources 11 Jul 2009 20:37:45 -0000 1.22
@@ -1 +1 @@
-36bfd924e92b61a6f5fe70c6bc8e5aac mediawiki-1.14.0.tar.gz
+fbe377a9df823de5b223818a260b51b1 mediawiki-1.15.0.tar.gz
--- mediawiki-1.14.0-commoncode.patch DELETED ---
- Previous message (by thread): rpms/mediawiki/devel mediawiki-1.15.0-commoncode.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 mediawiki.spec, 1.31, 1.32 sources, 1.21, 1.22 mediawiki-1.14.0-commoncode.patch, 1.1, NONE
- Next message (by thread): rpms/mysql/F-10 mysql-bug-44348.patch, NONE, 1.1 mysql.spec, 1.111, 1.112
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list