OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Oct-2007 13:41:56
Branch: HEAD Handle: 2007100112415600
Modified files:
openpkg-src/wordpress wordpress.patch wordpress.spec
Log:
finally upgrade to Wordpress 2.3
Summary:
Revision Changes Path
1.7 +8 -20 openpkg-src/wordpress/wordpress.patch
1.49 +29 -29 openpkg-src/wordpress/wordpress.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 wordpress.patch
--- openpkg-src/wordpress/wordpress.patch 21 Jun 2007 09:23:05 -0000
1.6
+++ openpkg-src/wordpress/wordpress.patch 1 Oct 2007 11:41:56 -0000
1.7
@@ -1,19 +1,7 @@
-Index: wp-includes/formatting.php
---- wp-includes/formatting.php.orig 2007-04-13 01:19:16 +0200
-+++ wp-includes/formatting.php 2007-05-17 09:47:52 +0200
-@@ -78,7 +78,7 @@
- $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1",
$pee);
- $pee = preg_replace('!<br
/>(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
- if (strpos($pee, '<pre') !== false)
-- $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', "
stripslashes('$1') . stripslashes(clean_pre('$2')) . '</pre>' ", $pee);
-+ $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', "
wp_kses_stripslashes('$1') . wp_kses_stripslashes(clean_pre('$2')) . '</pre>'
", $pee);
- $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
-
- return $pee;
-Index: wp-login.php
---- wp-login.php.orig 2007-04-19 04:53:19 +0200
-+++ wp-login.php 2007-05-17 09:20:19 +0200
-@@ -114,7 +114,7 @@
+Index: wordpress/wp-login.php
+--- wordpress/wp-login.php.orig 2007-09-19 00:23:16 +0200
++++ wordpress/wp-login.php 2007-09-25 07:35:56 +0200
+@@ -113,7 +113,7 @@
// Now insert the new pass md5'd into the db
$wpdb->query("UPDATE $wpdb->users SET
user_activation_key = '$key' WHERE user_login = '$user_login'");
$message = __('Someone has asked to reset the
password for the following site and username.') . "\r\n\r\n";
@@ -22,7 +10,7 @@
$message .= sprintf(__('Username: %s'),
$user_login) . "\r\n\r\n";
$message .= __('To reset your password visit
the following address, otherwise just ignore this email and nothing will
happen.') . "\r\n\r\n";
$message .= get_option('siteurl') .
"/wp-login.php?action=rp&key=$key\r\n";
-@@ -188,7 +188,7 @@
+@@ -187,7 +187,7 @@
wp_cache_delete($user->user_login, 'userlogins');
$message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
$message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
@@ -31,9 +19,9 @@
if (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new
password'), get_option('blogname')), $message)) {
die('<p>' . __('The e-mail could not be sent.') . "<br />\n" .
__('Possible reason: your host may have disabled the mail() function...') .
'</p>');
-Index: wp-mail.php
---- wp-mail.php.orig 2007-05-05 04:51:20 +0200
-+++ wp-mail.php 2007-05-17 09:20:19 +0200
+Index: wordpress/wp-mail.php
+--- wordpress/wp-mail.php.orig 2007-09-18 18:32:22 +0200
++++ wordpress/wp-mail.php 2007-09-25 07:35:56 +0200
@@ -142,7 +142,7 @@
$post_category = $post_categories;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.spec
============================================================================
$ cvs diff -u -r1.48 -r1.49 wordpress.spec
--- openpkg-src/wordpress/wordpress.spec 8 Sep 2007 07:35:02 -0000
1.48
+++ openpkg-src/wordpress/wordpress.spec 1 Oct 2007 11:41:56 -0000
1.49
@@ -23,16 +23,16 @@
##
# package versions
-%define V_wordpress 2.2.3
+%define V_wordpress 2.3
%define V_plugin_simpletagging 1-6
-%define V_plugin_dbmanager 211
-%define V_plugin_pagenavi 211
-%define V_plugin_polls 220
-%define V_plugin_postviews 111
-%define V_plugin_print 211
-%define V_plugin_relativedate 111
-%define V_plugin_stats 211
-%define V_plugin_ban 111
+%define V_plugin_dbmanager 220
+%define V_plugin_pagenavi 220
+%define V_plugin_polls 221
+%define V_plugin_postviews 120
+%define V_plugin_print 220
+%define V_plugin_relativedate 120
+%define V_plugin_stats 220
+%define V_plugin_ban 120
%define V_plugin_ela 0.10
# package information
@@ -46,7 +46,7 @@
Group: CMS
License: GPL
Version: %{V_wordpress}
-Release: 20070908
+Release: 20071001
# list of sources
Source0: http://wordpress.org/wordpress-%{V_wordpress}.tar.gz
@@ -55,14 +55,14 @@
Source3: wordpress-cron.sh
Source4: rc.wordpress
Source10:
http://sw-guide.de/_mw-uploads/simple-tagging_%{V_plugin_simpletagging}.zip
-Source11:
http://www.lesterchan.net/others/downloads/wp-dbmanager%{V_plugin_dbmanager}.zip
-Source12:
http://www.lesterchan.net/others/downloads/wp-pagenavi%{V_plugin_pagenavi}.zip
-Source13:
http://www.lesterchan.net/others/downloads/wp-polls%{V_plugin_polls}.zip
-Source14:
http://www.lesterchan.net/others/downloads/wp-postviews%{V_plugin_postviews}.zip
-Source15:
http://www.lesterchan.net/others/downloads/wp-print%{V_plugin_print}.zip
-Source16:
http://www.lesterchan.net/others/downloads/wp-relativedate%{V_plugin_relativedate}.zip
-Source17:
http://www.lesterchan.net/others/downloads/wp-stats%{V_plugin_stats}.zip
-Source18:
http://www.lesterchan.net/others/downloads/wp-ban%{V_plugin_ban}.zip
+Source11:
http://lesterchan.net/others/downloads/wp-dbmanager%{V_plugin_dbmanager}.zip
+Source12:
http://lesterchan.net/others/downloads/wp-pagenavi%{V_plugin_pagenavi}.zip
+Source13:
http://lesterchan.net/others/downloads/wp-polls%{V_plugin_polls}.zip
+Source14:
http://lesterchan.net/others/downloads/wp-postviews%{V_plugin_postviews}.zip
+Source15:
http://lesterchan.net/others/downloads/wp-print%{V_plugin_print}.zip
+Source16:
http://lesterchan.net/others/downloads/wp-relativedate%{V_plugin_relativedate}.zip
+Source17:
http://lesterchan.net/others/downloads/wp-stats%{V_plugin_stats}.zip
+Source18:
http://lesterchan.net/others/downloads/wp-ban%{V_plugin_ban}.zip
Source19:
http://www.sonsofskadi.net/wp-content/upload/af-extended-live-archive-%{V_plugin_ela}.zip
Patch0: wordpress.patch
@@ -98,49 +98,49 @@
}
prog wordpress:plugin-dbmanager = {
version = %{V_plugin_dbmanager}
- url =
http://www.lesterchan.net/wordpress/readme/wp-dbmanager.html
+ url = http://lesterchan.net/wordpress/readme/wp-dbmanager.html
regex = WP-DBManager\s+(\d+\.\d+)
transform = "s/^(\d+)\.(\d+)$/$1$2/s, $_"
}
prog wordpress:plugin-pagenavi = {
version = %{V_plugin_pagenavi}
- url =
http://www.lesterchan.net/wordpress/readme/wp-pagenavi.html
+ url = http://lesterchan.net/wordpress/readme/wp-pagenavi.html
regex = WP-PageNavi\s+(\d+\.\d+)
transform = "s/^(\d+)\.(\d+)$/$1$2/s, $_"
}
prog wordpress:plugin-polls = {
version = %{V_plugin_polls}
- url = http://www.lesterchan.net/wordpress/readme/wp-polls.html
+ url = http://lesterchan.net/wordpress/readme/wp-polls.html
regex = WP-Polls\s+(\d+\.\d+)
transform = "s/^(\d+)\.(\d+)$/$1$2/s, $_"
}
prog wordpress:plugin-postviews = {
version = %{V_plugin_postviews}
- url =
http://www.lesterchan.net/wordpress/readme/wp-postviews.html
+ url = http://lesterchan.net/wordpress/readme/wp-postviews.html
regex = WP-PostViews\s+(\d+\.\d+)
transform = "s/^(\d+)\.(\d+)$/$1$2/s, $_"
}
prog wordpress:plugin-print = {
version = %{V_plugin_print}
- url = http://www.lesterchan.net/wordpress/readme/wp-print.html
+ url = http://lesterchan.net/wordpress/readme/wp-print.html
regex = WP-Print\s+(\d+\.\d+)
transform = "s/^(\d+)\.(\d+)$/$1$2/s, $_"
}
prog wordpress:plugin-relativedate = {
version = %{V_plugin_relativedate}
- url =
http://www.lesterchan.net/wordpress/readme/wp-relativedate.html
+ url =
http://lesterchan.net/wordpress/readme/wp-relativedate.html
regex = WP-RelativeDate\s+(\d+\.\d+)
transform = "s/^(\d+)\.(\d+)$/$1$2/s, $_"
}
prog wordpress:plugin-stats = {
version = %{V_plugin_stats}
- url = http://www.lesterchan.net/wordpress/readme/wp-stats.html
+ url = http://lesterchan.net/wordpress/readme/wp-stats.html
regex = WP-Stats\s+(\d+\.\d+)
transform = "s/^(\d+)\.(\d+)$/$1$2/s, $_"
}
prog wordpress:plugin-ban = {
version = %{V_plugin_ban}
- url = http://www.lesterchan.net/wordpress/readme/wp-ban.html
+ url = http://lesterchan.net/wordpress/readme/wp-ban.html
regex = WP-Ban\s+(\d+\.\d+)
transform = "s/^(\d+)\.(\d+)$/$1$2/s, $_"
}
@@ -162,14 +162,14 @@
%{l_prefix}/bin/unzip -q -o -x %{SOURCE17}
%{l_prefix}/bin/unzip -q -o -x %{SOURCE18}
%{l_prefix}/bin/unzip -q -o -x %{SOURCE19}
- %patch -p0 -d wordpress
+ %patch -p0
%build
# create configuration file
%{l_shtool} install -m 644 \
-e 's;putyourdbnamehere;wordpress;g' \
- -e 's;wordpresshere;wordpress;g' \
- -e 's;yourwordpresshere;wordpress;g' \
+ -e 's;usernamehere;wordpress;g' \
+ -e 's;yourpasswordhere;wordpress;g' \
wordpress/wp-config-sample.php wordpress/wp-config.php
%install
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
