packages: mediawiki/mediawiki-confdir2.patch, mediawiki/mediawiki.spec, med...

kosmo kosmo at pld-linux.org
Wed Dec 28 21:25:17 CET 2011 

Author: kosmo                        Date: Wed Dec 28 20:25:17 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.18.0

---- Files affected:
packages/mediawiki:
   mediawiki-confdir2.patch (1.8 -> 1.9) , mediawiki.spec (1.62 -> 1.63) , mediawiki-mysqlroot.patch (1.8 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/mediawiki/mediawiki-confdir2.patch
diff -u packages/mediawiki/mediawiki-confdir2.patch:1.8 packages/mediawiki/mediawiki-confdir2.patch:1.9
--- packages/mediawiki/mediawiki-confdir2.patch:1.8	Tue Sep 30 17:06:21 2008
+++ packages/mediawiki/mediawiki-confdir2.patch	Wed Dec 28 21:25:12 2011
@@ -1,63 +1,71 @@
-diff -burNp mediawiki-1.13.1/config/index.php mediawiki-1.13.1-new/config/index.php
---- mediawiki-1.13.1/config/index.php	2008-07-20 16:29:04.000000000 +0200
-+++ mediawiki-1.13.1-new/config/index.php	2008-09-30 16:51:42.565158565 +0200
-@@ -209,7 +209,7 @@ $mainListOpened = false; # Is the main l
- 
- /* Check for existing configurations and bug out! */
- 
--if( file_exists( "../LocalSettings.php" ) ) {
-+if( file_exists( "" ) ) {
- 	$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>" );
-@@ -225,7 +225,7 @@ if( !is_writable( "." ) ) {
- 
- 	<p>In order to configure the wiki you have to make the <tt>config</tt> subdirectory
- 	writable by the web server. Once configuration is done you'll move the created
--	<tt>LocalSettings.php</tt> to the parent directory, and for added safety you can
-+	<tt>LocalSettings.php</tt> to the /etc/webapps/mediawiki directory, and for added safety you can
- 	then remove the <tt>config</tt> subdirectory entirely.</p>
- 
- 	<p>To make the directory writable on a Unix/Linux system:</p>
-@@ -1489,7 +1489,7 @@ EOT;
- <div class="success-box">
- <p>
- <span class="success-message">Installation successful!</span>
--Move the <tt>config/LocalSettings.php</tt> file to the parent directory, then follow
-+Move the <tt>/etc/webapps/mediawiki/LocalSettings.php</tt> file to the parent directory, then follow
- <a href="../$script"> this link</a> to your wiki.</p>
- <p>You should change file permissions for <tt>LocalSettings.php</tt> as required to
- prevent other users on the server reading passwords and altering configuration data.</p>
-diff -burNp mediawiki-1.13.1/includes/WebStart.php mediawiki-1.13.1-new/includes/WebStart.php
---- mediawiki-1.13.1/includes/WebStart.php	2008-06-16 22:21:26.000000000 +0200
-+++ mediawiki-1.13.1-new/includes/WebStart.php	2008-09-30 16:56:46.191001676 +0200
-@@ -84,7 +84,7 @@ require_once( "$IP/includes/Defines.php"
- # 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( "/etc/webapps/mediawiki/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 @@ if( !file_exists( "$IP/LocalSettings.php
- 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( "/etc/webapps/mediawiki/LocalSettings.php" );
- wfProfileOut( 'WebStart.php-conf' );
- 
- wfProfileIn( 'WebStart.php-ob_start' );
-diff -burNp mediawiki-1.13.1/maintenance/archives/upgradeWatchlist.php mediawiki-1.13.1-new/maintenance/archives/upgradeWatchlist.php
---- mediawiki-1.13.1/maintenance/archives/upgradeWatchlist.php	2008-07-11 00:00:04.000000000 +0200
-+++ mediawiki-1.13.1-new/maintenance/archives/upgradeWatchlist.php	2008-09-30 16:59:14.399305603 +0200
-@@ -15,7 +15,7 @@ exit();
- # Convert watchlists to new format
- 
- global $IP;
--require_once( "../LocalSettings.php" );
-+require_once( "/etc/webapps/mediawiki/LocalSettings.php" );
- require_once( "$IP/Setup.php" );
+diff -urN mediawiki-1.18.0.orig/includes/installer/Installer.php mediawiki-1.18.0/includes/installer/Installer.php
+--- mediawiki-1.18.0.orig/includes/installer/Installer.php	2011-11-18 01:42:24.000000000 +0100
++++ mediawiki-1.18.0/includes/installer/Installer.php	2011-12-28 20:04:35.000000000 +0100
+@@ -464,7 +464,7 @@
+ 		global $IP;
+ 
+ 		wfSuppressWarnings();
+-		$_lsExists = file_exists( "$IP/LocalSettings.php" );
++		$_lsExists = file_exists( "/etc/webapps/mediawiki/LocalSettings.php" );
+ 		wfRestoreWarnings();
+ 
+ 		if( !$_lsExists ) {
+@@ -473,7 +473,7 @@
+ 		unset($_lsExists);
+ 
+ 		require( "$IP/includes/DefaultSettings.php" );
+-		require( "$IP/LocalSettings.php" );
++		require( "/etc/webapps/mediawiki/LocalSettings.php" );
+ 		if ( file_exists( "$IP/AdminSettings.php" ) ) {
+ 			require( "$IP/AdminSettings.php" );
+ 		}
+diff -urN mediawiki-1.18.0.orig/includes/Setup.php mediawiki-1.18.0/includes/Setup.php
+--- mediawiki-1.18.0.orig/includes/Setup.php	2011-10-26 20:47:09.000000000 +0200
++++ mediawiki-1.18.0/includes/Setup.php	2011-12-28 20:04:34.000000000 +0100
+@@ -308,7 +308,7 @@
+ }
+ 
+ if ( $wgInvalidateCacheOnLocalSettingsChange ) {
+-	$wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( "$IP/LocalSettings.php" ) ) );
++	$wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( "/etc/webapps/mediawiki/LocalSettings.php" ) ) );
+ }
+ 
+ if ( $wgAjaxUploadDestCheck ) {
+diff -urN mediawiki-1.18.0.orig/maintenance/checkSyntax.php mediawiki-1.18.0/maintenance/checkSyntax.php
+--- mediawiki-1.18.0.orig/maintenance/checkSyntax.php	2011-07-06 23:57:44.000000000 +0200
++++ mediawiki-1.18.0/maintenance/checkSyntax.php	2011-12-28 20:04:37.000000000 +0100
+@@ -153,8 +153,8 @@
+ 		}
+ 
+ 		// Manually add two user-editable files that are usually sources of problems
+-		if ( file_exists( "$IP/LocalSettings.php" ) ) {
+-			$this->mFiles[] = "$IP/LocalSettings.php";
++		if ( file_exists( "/etc/webapps/mediawiki/LocalSettings.php" ) ) {
++			$this->mFiles[] = "/etc/webapps/mediawiki/LocalSettings.php";
+ 		}
+ 		if ( file_exists( "$IP/AdminSettings.php" ) ) {
+ 			$this->mFiles[] = "$IP/AdminSettings.php";
+diff -urN mediawiki-1.18.0.orig/maintenance/Maintenance.php mediawiki-1.18.0/maintenance/Maintenance.php
+--- mediawiki-1.18.0.orig/maintenance/Maintenance.php	2011-11-15 18:29:10.000000000 +0100
++++ mediawiki-1.18.0/maintenance/Maintenance.php	2011-12-28 20:04:37.000000000 +0100
+@@ -961,7 +961,7 @@
+ 		} elseif ( defined("MW_CONFIG_FILE") ) {
+ 			$settingsFile = MW_CONFIG_FILE;
+ 		} else {
+-			$settingsFile = "$IP/LocalSettings.php";
++			$settingsFile = "/etc/webapps/mediawiki/LocalSettings.php";
+ 		}
+ 		if ( isset( $this->mOptions['wiki'] ) ) {
+ 			$bits = explode( '-', $this->mOptions['wiki'] );
+diff -urN mediawiki-1.18.0.orig/includes/WebStart.php mediawiki-1.18.0/includes/WebStart.php
+--- mediawiki-1.18.0.orig/includes/WebStart.php	2011-06-28 20:21:59.000000000 +0200
++++ mediawiki-1.18.0/includes/WebStart.php	2011-12-28 20:31:51.000000000 +0100
+@@ -119,7 +119,7 @@
+ 	MWFunction::call( MW_CONFIG_CALLBACK );
+ } else {
+ 	if ( !defined( 'MW_CONFIG_FILE' ) ) {
+-		define('MW_CONFIG_FILE', MWInit::interpretedPath( 'LocalSettings.php' ) );
++		define('MW_CONFIG_FILE', '/etc/webapps/mediawiki/LocalSettings.php');
+ 	}
  
- $wgTitle = Title::newFromText( "Rebuild links script" );
+ 	# LocalSettings.php is the per site customization file. If it does not exist

================================================================
Index: packages/mediawiki/mediawiki.spec
diff -u packages/mediawiki/mediawiki.spec:1.62 packages/mediawiki/mediawiki.spec:1.63
--- packages/mediawiki/mediawiki.spec:1.62	Wed Dec  2 11:05:33 2009
+++ packages/mediawiki/mediawiki.spec	Wed Dec 28 21:25:12 2011
@@ -8,15 +8,14 @@
 Summary:	MediaWiki - the collaborative editing software that runs Wikipedia
 Summary(pl.UTF-8):	MediaWiki - oprogramowanie do wspólnej edycji, na którym działa Wikipedia
 Name:		mediawiki
-Version:	1.13.5
-Release:	2
+Version:	1.18.0
+Release:	0
 License:	GPL
 Group:		Applications/WWW
-Source0:	http://download.wikimedia.org/mediawiki/1.13/%{name}-%{version}.tar.gz
-# Source0-md5:	057d7c2a709f14f3806717695ed41b22
+Source0:	http://download.wikimedia.org/mediawiki/1.18/%{name}-%{version}.tar.gz
+# Source0-md5:	21d2560ff1a71a309c786c753931abe0
 Source1:	%{name}.conf
-Patch0:		%{name}-mysqlroot.patch
-Patch1:		%{name}-confdir2.patch
+Patch0:		%{name}-confdir2.patch
 URL:		http://www.mediawiki.org/
 BuildRequires:	sed >= 4.0
 %if %{with apidocs}
@@ -39,6 +38,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_noautoreq	^/usr/bin/hphpi$
+
 %define		_appdir		%{_datadir}/%{name}
 %define		_webapps	/etc/webapps
 %define		_webapp		%{name}
@@ -74,7 +75,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
 find -name '*.php5' | xargs rm -v
@@ -83,10 +83,8 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 
-cp -a config extensions images includes languages maintenance math skins $RPM_BUILD_ROOT%{_appdir}
-cp -a AdminSettings.sample $RPM_BUILD_ROOT%{_sysconfdir}/AdminSettings.php
-
-cp *.php install-utils.inc $RPM_BUILD_ROOT%{_appdir}
+cp -a mw-config extensions images includes languages maintenance resources skins $RPM_BUILD_ROOT%{_appdir}
+cp *.php $RPM_BUILD_ROOT%{_appdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
@@ -187,27 +185,25 @@
 
 %files
 %defattr(644,root,root,755)
-%doc docs FAQ HISTORY INSTALL README RELEASE-NOTES UPGRADE *.sample tests
+%doc docs FAQ HISTORY INSTALL README RELEASE-NOTES-1.18 UPGRADE *.sample tests
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/AdminSettings.php
 
 %dir %{_appdir}
 %{_appdir}/*.php
 %{_appdir}/languages
-%{_appdir}/math
 %{_appdir}/images
 %{_appdir}/extensions
+%{_appdir}/resources
 %{_appdir}/skins
 %{_appdir}/includes
 %{_appdir}/maintenance
 
 %files setup
 %defattr(644,root,root,755)
-%dir %attr(775,root,http) %{_appdir}/config
-%{_appdir}/install-utils.inc
-%{_appdir}/config/index.php
+%dir %attr(775,root,http) %{_appdir}/mw-config
+%{_appdir}/mw-config/index.php
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -215,6 +211,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2011/12/28 20:25:12  kosmo
+- updated to 1.18.0
+
 Revision 1.62  2009/12/02 10:05:33  glen
 - R: session; http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2009-December/021307.html; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mediawiki/mediawiki-confdir2.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mediawiki/mediawiki.spec?r1=1.62&r2=1.63&f=u

More information about the pld-cvs-commit mailing list