rpms/wordpress
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to 4.1

Browse source 
(cherry picked from commit cdc67b2be0)
This commit is contained in:
Remi Collet 2014-12-22 07:01:01 +01:00
commit 9ab1dede2a
6 changed files with 38 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -11,3 +11,4 @@ clog
/wordpress-3.9.2.tar.gz
/wordpress-4.0.tar.gz
/wordpress-4.0.1.tar.gz
/wordpress-4.1.tar.gz

2
sources
View file

@ -1 +1 @@
531d9a4829fc40d81f5ee4a681f71f94 wordpress-4.0.1.tar.gz
5adac1bfc61b793a1ca9bcb4d67b4d28 wordpress-4.1.tar.gz

11
wordpress-3.9-mediaelement-noflash_silverlight.patch
View file

@ -1,11 +0,0 @@
--- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js.orig 2014-05-07 17:16:34.465747946 +0200
+++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js 2014-05-07 17:21:09.213739591 +0200
@@ -39,7 +39,7 @@
mejs.MediaPluginBridge.unregisterPluginElement(this.pluginElement.id)}};
mejs.MediaPluginBridge={pluginMediaElements:{},htmlMediaElements:{},registerPluginElement:function(a,b,c){this.pluginMediaElements[a]=b;this.htmlMediaElements[a]=c},unregisterPluginElement:function(a){delete this.pluginMediaElements[a];delete this.htmlMediaElements[a]},initPlugin:function(a){var b=this.pluginMediaElements[a],c=this.htmlMediaElements[a];if(b){switch(b.pluginType){case "flash":b.pluginElement=b.pluginApi=document.getElementById(a);break;case "silverlight":b.pluginElement=document.getElementById(b.id);
b.pluginApi=b.pluginElement.Content.MediaElementJS}b.pluginApi!=null&&b.success&&b.success(b,c)}},fireEvent:function(a,b,c){var d,e;if(a=this.pluginMediaElements[a]){b={type:b,target:a};for(d in c){a[d]=c[d];b[d]=c[d]}e=c.bufferedTime||0;b.target.buffered=b.buffered={start:function(){return 0},end:function(){return e},length:1};a.dispatchEvent(b.type,b)}}};
-mejs.MediaElementDefaults={mode:"auto",plugins:["flash","silverlight","youtube","vimeo"],enablePluginDebug:false,httpsBasicAuthSite:false,type:"",pluginPath:mejs.Utility.getScriptPath(["mediaelement.js","mediaelement.min.js","mediaelement-and-player.js","mediaelement-and-player.min.js"]),flashName:"flashmediaelement.swf",flashStreamer:"",enablePluginSmoothing:false,enablePseudoStreaming:false,pseudoStreamingStartQueryParam:"start",silverlightName:"silverlightmediaelement.xap",defaultVideoWidth:480,
+mejs.MediaElementDefaults={mode:"auto",plugins:["youtube","vimeo"],enablePluginDebug:false,httpsBasicAuthSite:false,type:"",pluginPath:mejs.Utility.getScriptPath(["mediaelement.js","mediaelement.min.js","mediaelement-and-player.js","mediaelement-and-player.min.js"]),flashName:"flashmediaelement.swf",flashStreamer:"",enablePluginSmoothing:false,enablePseudoStreaming:false,pseudoStreamingStartQueryParam:"start",silverlightName:"silverlightmediaelement.xap",defaultVideoWidth:480,
defaultVideoHeight:270,pluginWidth:-1,pluginHeight:-1,pluginVars:[],timerRate:250,startVolume:0.8,success:function(){},error:function(){}};mejs.MediaElement=function(a,b){return mejs.HtmlMediaElementShim.create(a,b)};
mejs.HtmlMediaElementShim={create:function(a,b){var c=mejs.MediaElementDefaults,d=typeof a=="string"?document.getElementById(a):a,e=d.tagName.toLowerCase(),g=e==="audio"||e==="video",f=g?d.getAttribute("src"):d.getAttribute("href");e=d.getAttribute("poster");var i=d.getAttribute("autoplay"),k=d.getAttribute("preload"),h=d.getAttribute("controls"),j;for(j in b)c[j]=b[j];f=typeof f=="undefined"||f===null||f==""?null:f;e=typeof e=="undefined"||e===null?"":e;k=typeof k=="undefined"||k===null||k==="false"?
"none":k;i=!(typeof i=="undefined"||i===null||i==="false");h=!(typeof h=="undefined"||h===null||h==="false");j=this.determinePlayback(d,c,mejs.MediaFeatures.supportsMediaTag,g,f);j.url=j.url!==null?mejs.Utility.absolutizeUrl(j.url):"";if(j.method=="native"){if(mejs.MediaFeatures.isBustedAndroid){d.src=j.url;d.addEventListener("click",function(){d.play()},false)}return this.updateNative(j,c,i,k)}else if(j.method!=="")return this.createPlugin(j,c,e,i,k,h);else{this.createErrorMessage(j,c,e);return this}},

11
wordpress-4.1-mediaelement-noflash_silverlight.patch Normal file
View file

File diff suppressed because one or more lines are too long

38
wordpress-4.0-noupdate.patch → wordpress-4.1-noupdate.patch
View file

@ -1,7 +1,7 @@
diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admin/includes/class-wp-upgrader.php
--- wordpress/wp-admin/includes/class-wp-upgrader.php.nop 2014-04-15 12:57:14.000000000 +0200
+++ wordpress/wp-admin/includes/class-wp-upgrader.php 2014-05-07 17:25:04.434588696 +0200
@@ -1618,6 +1618,9 @@ class Core_Upgrader extends WP_Upgrader
diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.rpm wordpress/wp-admin/includes/class-wp-upgrader.php
--- wordpress/wp-admin/includes/class-wp-upgrader.php.rpm 2014-12-16 20:54:23.000000000 +0100
+++ wordpress/wp-admin/includes/class-wp-upgrader.php 2014-12-22 06:46:28.487097611 +0100
@@ -2141,6 +2141,9 @@ class Core_Upgrader extends WP_Upgrader
}
}
@ -11,7 +11,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admi
// 1: If we're already on that version, not much point in updating?
if ( $offered_ver == $wp_version )
return false;
@@ -1806,7 +1806,7 @@ class WP_Automatic_Updater {
@@ -2372,7 +2375,7 @@ class WP_Automatic_Updater {
*/
public function is_disabled() {
// Background updates are disabled if you don't want file changes.
@ -20,9 +20,9 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admi
return true;
if ( defined( 'WP_INSTALLING' ) )
diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/update.php
--- wordpress/wp-admin/includes/update.php.nop 2014-04-16 02:38:14.000000000 +0200
+++ wordpress/wp-admin/includes/update.php 2014-05-07 17:26:14.139840288 +0200
diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php
--- wordpress/wp-admin/includes/update.php.rpm 2014-11-30 12:28:24.000000000 +0100
+++ wordpress/wp-admin/includes/update.php 2014-12-22 06:46:28.487097611 +0100
@@ -211,8 +211,6 @@ function update_nag() {
}
echo "<div class='update-nag'>$msg</div>";
@ -41,10 +41,10 @@ diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/
}
echo "<p id='wp-version-message'>$msg</p>";
diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabilities.php
--- wordpress/wp-includes/capabilities.php.orig 2014-08-27 03:32:18.000000000 +0200
+++ wordpress/wp-includes/capabilities.php 2014-09-08 13:22:00.463291244 +0200
@@ -1252,7 +1252,7 @@
diff -up wordpress/wp-includes/capabilities.php.rpm wordpress/wp-includes/capabilities.php
--- wordpress/wp-includes/capabilities.php.rpm 2014-12-01 02:34:24.000000000 +0100
+++ wordpress/wp-includes/capabilities.php 2014-12-22 06:46:28.487097611 +0100
@@ -1255,7 +1255,7 @@ function map_meta_cap( $cap, $user_id )
// Disallow the file editors.
if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
$caps[] = 'do_not_allow';
@ -53,7 +53,7 @@ diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabi
$caps[] = 'do_not_allow';
elseif ( is_multisite() && ! is_super_admin( $user_id ) )
$caps[] = 'do_not_allow';
@@ -1270,7 +1270,7 @@
@@ -1273,7 +1273,7 @@ function map_meta_cap( $cap, $user_id )
case 'update_core':
// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
// Files in uploads are excepted.
@ -62,10 +62,10 @@ diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabi
$caps[] = 'do_not_allow';
} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
$caps[] = 'do_not_allow';
diff -up wordpress/wp-includes/update.php.nop wordpress/wp-includes/update.php
--- wordpress/wp-includes/update.php.nop 2014-04-16 02:38:14.000000000 +0200
+++ wordpress/wp-includes/update.php 2014-05-07 17:25:04.435588699 +0200
@@ -624,9 +624,6 @@ function _maybe_update_themes() {
diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php
--- wordpress/wp-includes/update.php.rpm 2014-12-22 06:48:34.883575009 +0100
+++ wordpress/wp-includes/update.php 2014-12-22 06:48:44.144609988 +0100
@@ -626,9 +626,6 @@ function _maybe_update_themes() {
* @since 3.1.0
*/
function wp_schedule_update_checks() {
@ -75,8 +75,8 @@ diff -up wordpress/wp-includes/update.php.nop wordpress/wp-includes/update.php
if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') )
wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
@@ -652,8 +649,6 @@ if ( ( ! is_main_site() && ! is_network_
return;
@@ -671,8 +668,6 @@ if ( ( ! is_main_site() && ! is_network_
}
add_action( 'admin_init', '_maybe_update_core' );
-add_action( 'wp_version_check', 'wp_version_check' );

9
wordpress.spec
View file

@ -16,7 +16,7 @@
Summary: Blog tool and publishing platform
URL: http://www.wordpress.org
Name: wordpress
Version: 4.0.1
Version: 4.1
Group: Applications/Publishing
Release: 1%{?dist}
License: GPLv2
@ -41,7 +41,7 @@ Patch3: wordpress-4.0-tinymce_noflash.patch
# Adjust mediaelement not to use its SWF and Silverlight plugins. This
# changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to
# 'plugins:["youtube","vimeo"]'
Patch4: wordpress-3.9-mediaelement-noflash_silverlight.patch
Patch4: wordpress-4.1-mediaelement-noflash_silverlight.patch
# RPM configuration:
# Path to installation
# Disable auto-updater
@ -50,7 +50,7 @@ Patch5: wordpress-4.0-config.patch
# disable version check and updated
# change DISALLOW_FILE_MODS default value to true
# ignore WP_AUTO_UPDATE_CORE (always false)
Patch6: wordpress-4.0-noupdate.patch
Patch6: wordpress-4.1-noupdate.patch
# Use system libraries
Patch7: wordpress-4.0-systemlibs.patch
@ -280,6 +280,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_datadir}/wordpress/xmlrpc.php
%changelog
* Mon Dec 22 2014 Remi Collet <remi@fedoraproject.org> - 4.1-1
- WordPress 4.1 “Dinah”
* Fri Nov 21 2014 Remi Collet <remi@fedoraproject.org> - 4.0.1-1
- WordPress 4.0.1 Security Release
- use system php-getid3 when available #1145574