diff --git a/.gitignore b/.gitignore index db8025a..ad4dbd7 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ clog /wordpress-4.7.1.tar.gz /wordpress-4.7.2.tar.gz /wordpress-4.7.3.tar.gz +/wordpress-4.7.4.tar.gz diff --git a/sources b/sources index 474cc26..78b310c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.7.3.tar.gz) = 071df65c3a43557faf351838a661a83e26d8de37c8633dc17a59d773cc91caef640a625b0719606df1fc563fd18af71ba1da22a5b6f345339e73761754484dc5 +SHA512 (wordpress-4.7.4.tar.gz) = 9d1b7fa2688e80d8e8409bd9f7fa61007b266de70a11eaa592fc737c501906e9c14b20eab63542077acb8dd65f5491f481b0945f5ed9e98d8b5207a47c3ec950 diff --git a/wordpress-4.0-tinymce_noflash.patch b/wordpress-4.0-tinymce_noflash.patch index 217e7f9..76f1bb9 100644 --- a/wordpress-4.0-tinymce_noflash.patch +++ b/wordpress-4.0-tinymce_noflash.patch @@ -1,23 +1,30 @@ -diff -up wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.rpm wordpress/wp-includes/js/tinymce/plugins/media/plugin.js ---- wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.rpm 2014-08-22 01:53:18.000000000 +0200 -+++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js 2014-09-08 13:10:15.717314458 +0200 -@@ -46,10 +46,6 @@ tinymce.PluginManager.add('media', funct - return 'video/ogg'; - } - -- if (url.indexOf('.swf') != -1) { -- return 'application/x-shockwave-flash'; -- } +diff -Nur wordpress.orig/wp-includes/js/tinymce/plugins/media/plugin.js wordpress/wp-includes/js/tinymce/plugins/media/plugin.js +--- wordpress.orig/wp-includes/js/tinymce/plugins/media/plugin.js 2017-04-12 19:52:38.000000000 -0600 ++++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js 2017-04-22 11:28:42.415026834 -0600 +@@ -438,7 +438,6 @@ + 'mp4': 'video/mp4', + 'webm': 'video/webm', + 'ogg': 'video/ogg', +- 'swf': 'application/x-shockwave-flash' + }; + var fileEnd = url.toLowerCase().split('.').pop(); + var mime = mimes[fileEnd]; +@@ -583,18 +582,6 @@ + '" width="' + data.width + + '" height="' + data.height + + '"' + allowFullscreen + '>'; +- } else if (data.source1mime === "application/x-shockwave-flash") { +- html += +- ''; - - return ''; - } - -@@ -247,7 +243,7 @@ tinymce.PluginManager.add('media', funct - data.source1mime = guessMime(data.source1); - data.source2mime = guessMime(data.source2); - data.poster = editor.convertURL(data.poster, "poster"); -- data.flashPlayerUrl = editor.convertURL(url + '/moxieplayer.swf', "movie"); -+ data.flashPlayerUrl = false; - - tinymce.each(urlPatterns, function(pattern) { - var match, i, url; +- if (data.poster) { +- html += ''; +- } +- +- html += ''; + } else if (data.source1mime.indexOf('audio') !== -1) { + if (editor.settings.audio_template_callback) { + html = editor.settings.audio_template_callback(data); diff --git a/wordpress.spec b/wordpress.spec index d1b688c..d6733de 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -25,7 +25,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.7.3 +Version: 4.7.4 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -307,6 +307,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Sat Apr 22 2017 Kevin Fenzi - 4.7.4-1 +- Update to 4.7.4. Maintenance Release. + * Tue Mar 7 2017 Remi Collet - 4.7.3-1 - WordPress 4.7.3 Security and Maintenance Release