From b1489107ff8fc8af7fe95ac07b29001a18166fd0 Mon Sep 17 00:00:00 2001
From: Robert Tomasik <rotom@pld-linux.org>
Date: Sat, 30 Jan 2010 16:41:13 +0000
Subject: [PATCH] - up to 2.9.1

Changed files:
    wordpress.patch -> 1.2
    wordpress.spec -> 1.53
---
 wordpress.patch | 28 ++++++++++------------------
 wordpress.spec  |  6 +++---
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/wordpress.patch b/wordpress.patch
index 38edc18..52edc65 100644
--- a/wordpress.patch
+++ b/wordpress.patch
@@ -14,22 +14,14 @@
  
  	/** The config file resides in ABSPATH */
  	require_once( ABSPATH . 'wp-config.php' );
---- wordpress/wp-admin/setup-config.php~	2009-03-20 10:38:16.000000000 +0200
-+++ wordpress/wp-admin/setup-config.php	2009-03-20 10:42:40.461577381 +0200
-@@ -155,7 +155,7 @@
- 	if ( !empty($wpdb->error) )
- 		wp_die($wpdb->error->get_error_message());
- 
--	$handle = fopen('../wp-config.php', 'w');
-+	$handle = fopen('/etc/webapps/wordpress/wp-config.php', 'w');
- 
- 	foreach ($configFile as $line_num => $line) {
- 		switch (substr($line,0,16)) {
-@@ -179,7 +179,6 @@
+--- wordpress/wp-admin/setup-config.php.orig	2009-11-20 05:11:01.000000000 +0100
++++ wordpress/wp-admin/setup-config.php	2010-01-23 19:09:28.000000000 +0100
+@@ -199,7 +199,7 @@
+ <p class="step"><a href="install.php" class="button">Run the install</a></p>
+ <?php
+ 	else :
+-		$handle = fopen(ABSPATH . 'wp-config.php', 'w');
++		$handle = fopen(ABSPATH . '/etc/webapps/wordpress/wp-config.php', 'w');
+ 		foreach( $configFile as $line ) {
+ 			fwrite($handle, $line);
  		}
- 	}
- 	fclose($handle);
--	chmod('../wp-config.php', 0666);
- 
- 	display_header();
- ?>
diff --git a/wordpress.spec b/wordpress.spec
index fb32ab9..b550237 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -3,12 +3,12 @@
 Summary:	Personal publishing system
 Summary(pl.UTF-8):	Osobisty system publikacji
 Name:		wordpress
-Version:	2.7.1
-Release:	1.5
+Version:	2.9.1
+Release:	1
 License:	GPL
 Group:		Applications/Publishing
 Source0:	http://wordpress.org/%{name}-%{version}.tar.gz
-# Source0-md5:	3f1e1607e5ce1328c305e0192ff3352a
+# Source0-md5:	3af6bfaac37faa6ba58294f3de29c311
 Source1:	wp-secure.sh
 Source2:	wp-setup.sh
 Source3:	wp-setup.txt
-- 
2.44.0