+ config/LocalSettings.php to the parent directory.' );
+ } else {
+ echo( "Please
set up the wiki 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( "
Setup has completed, your wiki is configured.
+
Please delete the /config directory for extra security.
" );
+ }
+
+-if( file_exists( "./LocalSettings.php" ) ) {
++if( file_exists( "$DIR/LocalSettings.php" ) ) {
+ writeSuccessMessage();
+ dieout( '' );
+ }
+
+-if( !is_writable( "." ) ) {
++if( !is_writable( $DIR . "/config" ) ) {
+ dieout( "
Can't write config file, aborting
+
+
In order to configure the wiki you have to make the config 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( "\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" );
diff --git a/mediawiki-httpd.conf b/mediawiki-httpd.conf
deleted file mode 100644
index 7db0ff0..0000000
--- a/mediawiki-httpd.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-Alias /mediawiki /var/www/mediawiki
-
-
- Order deny,allow
- Deny from all
- Allow from 127.0.0.1
- # Allow from .example.com
-
-
-
- Deny from all
-
-
-
- Deny from all
-
-
-
- Deny from all
-
-
-
- Deny from all
-
diff --git a/mediawiki-install.txt b/mediawiki-install.txt
deleted file mode 100644
index 4b8f149..0000000
--- a/mediawiki-install.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-After installing the RPM, you should do the following in order to configure
-MediaWiki:
-
-1. Configure the necessary MySQL database. Read the following URL for
-some details:
-
- http://meta.wikimedia.org/wiki/MySQL_config
-
-2. (Optional) If you wish to configure MediaWiki from another machine,
- edit '/etc/httpd/conf.d/mediawiki.conf' and say so.
-
-3. Restart your web server:
-
- # /etc/init.d/httpd restart
-
-4. Browse to http://localhost/mediawiki/config/ and fill the necessary forms.
-
-5. Move the configuration file to the default location:
-
- # mv /var/www/mediawiki/config/LocalSettings.php /var/www/mediawiki
-
-6. Protect the config directory against accidental writes:
-
- # chmod g-w /var/mediawiki/config
-
-Your wiki will be set up.
-
-For more information about installation, please refer to:
-
- http://meta.wikimedia.org/wiki/Help:Installation
-
diff --git a/mediawiki.spec b/mediawiki.spec
index 695c0b0..13a8506 100644
--- a/mediawiki.spec
+++ b/mediawiki.spec
@@ -1,12 +1,12 @@
Summary: A wiki engine
Name: mediawiki
-Version: 1.12.0
-Release: 1%{?dist}
+Version: 1.13.0
+Release: 39%{?dist}
License: GPLv2+
Group: Development/Tools
URL: http://www.mediawiki.org/
-Source0: http://download.wikimedia.org/mediawiki/1.12/%{name}-%{version}.tar.gz
-Patch0: mediawiki-1.12.0-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
@@ -31,7 +31,7 @@ configuration.
%prep
%setup -q
-%patch0 -p1 -b .commoncode
+%patch -p1 -b .commoncode
%build
cd math
@@ -68,7 +68,6 @@ cd %{buildroot}/var/www/wiki/
mkdir images
cp -a %{buildroot}%{_datadir}/mediawiki/config .
ln -s %{_datadir}/mediawiki/index.php index.php
-ln -s %{_datadir}/mediawiki/skins skins
%clean
rm -rf %{buildroot}
@@ -85,16 +84,12 @@ rm -rf %{buildroot}
/var/www/wiki/config/*
%changelog
-* Wed Aug 13 2008 Orion Poplawski 1.12.0-1
-- Update to 1.12.0 (bug #250822)
-- Add skins symlink (bug #427167)
+* Sat Aug 16 2008 Axel Thimm - 1.13.0-39
+- Update to 1.13.0.
* Wed May 21 2008 Tom "spot" Callaway 1.10.4-40
- fix license tag
-* Thu Apr 10 2008 Ian Weller 1.10.4-39
-* Removed ExcludeArch
-
* Tue Mar 4 2008 Axel Thimm - 1.10.4-38
- Update to 1.10.4.
@@ -102,9 +97,6 @@ rm -rf %{buildroot}
- Update to 1.10.3.
- Fixes CVE-2008-0460 (bug #430286).
-* Wed Sep 12 2007 Ville Skyttä - 1.10.2-36
-- Update to 1.10.2 (security; http://secunia.com/advisories/26772/, #287881)
-
* Wed May 9 2007 Axel Thimm - 1.10.0-35
- Update to 1.10.0.
diff --git a/sources b/sources
index 1a25ad9..6847666 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-117a1360f440883a51f0ebca32906ea0 mediawiki-1.12.0.tar.gz
-854d40d2779f1fcf878eba22e41d2561 mediawiki-1.12.0-commoncode.patch
+6e51cb81fd57d90b870e984688734db6 mediawiki-1.13.0.tar.gz