rpms/mediawiki/F-9 mediawiki-1.13.0-commoncode.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 mediawiki.spec, 1.21, 1.22 sources, 1.14, 1.15

[Axel Thimm]

Author: athimm

Update of /cvs/extras/rpms/mediawiki/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10830/mediawiki/F-9

Modified Files:
	.cvsignore mediawiki.spec sources 
Added Files:
	mediawiki-1.13.0-commoncode.patch 
Log Message:
Backpackage to F9/F8.

mediawiki-1.13.0-commoncode.patch:

--- NEW FILE mediawiki-1.13.0-commoncode.patch ---
--- ./includes/templates/NoLocalSettings.php.commoncode	2008-05-20 19:13:28.000000000 +0200
+++ ./includes/templates/NoLocalSettings.php	2008-08-16 13:48:05.000000000 +0200
@@ -42,7 +42,7 @@
 		<h1>MediaWiki <?php echo $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=\"${path}config/index.{$ext}\" title='setup'> set up the wiki</a> first." );
--- ./includes/WebStart.php.commoncode	2008-06-16 22:21:26.000000000 +0200
+++ ./includes/WebStart.php	2008-08-16 13:48:51.000000000 +0200
@@ -84,7 +84,7 @@
 # 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();
@@ -94,7 +94,7 @@
 require_once( "$IP/includes/AutoLoader.php" );
 
 # 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' );
 
 wfProfileIn( 'WebStart.php-ob_start' );
--- ./maintenance/archives/upgradeWatchlist.php.commoncode	2008-07-11 00:00:04.000000000 +0200
+++ ./maintenance/archives/upgradeWatchlist.php	2008-08-16 13:49:46.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" );
--- ./maintenance/update.php.commoncode	2008-07-19 14:15:07.000000000 +0200
+++ ./maintenance/update.php	2008-08-16 13:48:05.000000000 +0200
@@ -10,6 +10,9 @@
  * @ingroup Maintenance
  */
 
+$DIR=getcwd();
+chdir('/usr/share/mediawiki');
+
 /** */
 $wgUseMasterForMaintenance = true;
 $options = array( 'quick', 'nopurge' );
--- ./maintenance/commandLine.inc.commoncode	2008-06-16 22:21:26.000000000 +0200
+++ ./maintenance/commandLine.inc	2008-08-16 13:50:18.000000000 +0200
@@ -182,7 +182,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'] );
@@ -208,7 +208,7 @@
 
 	$adminSettings = isset( $options['aconf'] )
 		? $options['aconf']
-		: "{$IP}/AdminSettings.php";
+		: "{$DIR}/AdminSettings.php";
 	if( is_readable( $adminSettings ) )
 		require_once( $adminSettings );
 
--- ./config/index.php.commoncode	2008-07-20 16:29:04.000000000 +0200
+++ ./config/index.php	2008-08-16 13:51:28.000000000 +0200
@@ -19,6 +19,8 @@
 # 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 +29,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
@@ -209,18 +211,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
@@ -1110,7 +1112,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" );
@@ -1633,7 +1635,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\" );
--- ./index.php.commoncode	2008-07-20 16:29:04.000000000 +0200
+++ ./index.php	2008-08-16 13:48:05.000000000 +0200
@@ -35,6 +35,9 @@
  */
 
 
+$DIR=getcwd();
+chdir('/usr/share/mediawiki');
+
 # Initialise common code
 $preIP = dirname( __FILE__ );
 require_once( "$preIP/includes/WebStart.php" );


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Mar 2008 03:26:38 -0000	1.14
+++ .cvsignore	24 Aug 2008 09:01:43 -0000	1.15
@@ -1,3 +1 @@
-mediawiki-1.9.1-commoncode.patch
-mediawiki-1.10.3.tar.gz
-mediawiki-1.10.4.tar.gz
+mediawiki-1.13.0.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/F-9/mediawiki.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mediawiki.spec	11 Apr 2008 01:13:50 -0000	1.21
+++ mediawiki.spec	24 Aug 2008 09:01:43 -0000	1.22
@@ -1,12 +1,12 @@
 Summary: A wiki engine
 Name: mediawiki
-Version: 1.10.4
+Version: 1.13.0
 Release: 39%{?dist}
-License: GPL
+License: GPLv2+
 Group: Development/Tools
 URL: http://www.mediawiki.org/
-Source0: http://download.wikimedia.org/mediawiki/1.10/%{name}-%{version}.tar.gz
-Patch0: mediawiki-1.9.1-commoncode.patch
+Source0: http://download.wikimedia.org/mediawiki/1.13/%{name}-%{version}.tar.gz
+Patch0: mediawiki-1.13.0-commoncode.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ocaml >= 3.06
 # to make sure the "apache" group is created before mediawiki is installed
@@ -84,8 +84,11 @@
 /var/www/wiki/config/*
 
 %changelog
-* Thu Apr 10 2008 Ian Weller <ianweller at gmail.com> 1.10.4-39
-* Removed ExcludeArch
+* Sat Aug 16 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.13.0-39
+- Update to 1.13.0.
+
+* Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.10.4-40
+- fix license tag
 
 * Tue Mar  4 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.10.4-38
 - Update to 1.10.4.
@@ -94,9 +97,6 @@
 - Update to 1.10.3.
 - Fixes CVE-2008-0460 (bug #430286).
 
-* Wed Sep 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.10.2-36
-- Update to 1.10.2 (security; http://secunia.com/advisories/26772/, #287881)
-
 * Wed May  9 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.10.0-35
 - Update to 1.10.0.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Mar 2008 03:26:38 -0000	1.14
+++ sources	24 Aug 2008 09:01:43 -0000	1.15
@@ -1,2 +1 @@
-d2fa9f438e9af6cc88ded2cf2af3a07c  mediawiki-1.9.1-commoncode.patch
-d81e5607a365b71f09496864e0aa93bb  mediawiki-1.10.4.tar.gz
+6e51cb81fd57d90b870e984688734db6  mediawiki-1.13.0.tar.gz