From 4706fe4a06897d5d068a525c71e7329db9556d2a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Aug 23 2013 22:08:56 +0000 Subject: new upstream release, drop flash and silverlight binaries --- diff --git a/wordpress-3.6-tinymce_noflash.patch b/wordpress-3.6-tinymce_noflash.patch new file mode 100644 index 0000000..a5d0a7f --- /dev/null +++ b/wordpress-3.6-tinymce_noflash.patch @@ -0,0 +1,6 @@ +--- wordpress/wp-includes/js/tinymce/plugins/media/editor_plugin.js 2012-07-07 09:22:53.000000000 -0700 ++++ wordpress/wp-includes/js/tinymce/plugins/media/editor_plugin.js.new 2013-08-23 11:57:22.032012144 -0700 +@@ -1 +1 @@ +-(function(){var b=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),a=tinymce.makeMap(b.join(",")),f=tinymce.html.Node,d,i,h=tinymce.util.JSON,g;d=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"],["EmbeddedAudio"],["Audio"]];function e(j){return typeof(j)=="string"?j.replace(/[^0-9%]/g,""):j}function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(s){return s&&s.nodeName==="IMG"&&n.dom.hasClass(s,"mceItemMedia")}r.editor=n;r.url=j;i="";for(m=0;m0){O+=(O?"&":"")+P+"="+escape(Q)}});if(O.length){G.params.flashvars=O}L=p.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(L,function(Q,P){G.params[P]=""+Q})}}G=z.attr("data-mce-json");if(!G){return}G=h.parse(G);q=this.getType(z.attr("class"));B=z.attr("data-mce-style");if(!B){B=z.attr("style");if(B){B=p.dom.serializeStyle(p.dom.parseStyle(B,"img"))}}G.width=z.attr("width")||G.width;G.height=z.attr("height")||G.height;if(q.name==="Iframe"){x=new f("iframe",1);tinymce.each(b,function(n){var J=z.attr(n);if(n=="class"&&J){J=J.replace(/mceItem.+ ?/g,"")}if(J&&J.length>0){x.attr(n,J)}});for(I in G.params){x.attr(I,G.params[I])}x.attr({style:B,src:G.params.src});z.replace(x);return}if(this.editor.settings.media_use_script){x=new f("script",1).attr("type","text/javascript");y=new f("#text",3);y.value="write"+q.name+"("+h.serialize(tinymce.extend(G.params,{width:z.attr("width"),height:z.attr("height")}))+");";x.append(y);z.replace(x);return}if(q.name==="Video"&&G.video.sources[0]){C=new f("video",1).attr(tinymce.extend({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);for(A=0;A0){O+=(O?"&":"")+P+"="+escape(Q)}});if(O.length){G.params.flashvars=O}L=p.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(L,function(Q,P){G.params[P]=""+Q})}}G=z.attr("data-mce-json");if(!G){return}G=h.parse(G);q=this.getType(z.attr("class"));B=z.attr("data-mce-style");if(!B){B=z.attr("style");if(B){B=p.dom.serializeStyle(p.dom.parseStyle(B,"img"))}}G.width=z.attr("width")||G.width;G.height=z.attr("height")||G.height;if(q.name==="Iframe"){x=new f("iframe",1);tinymce.each(b,function(n){var J=z.attr(n);if(n=="class"&&J){J=J.replace(/mceItem.+ ?/g,"")}if(J&&J.length>0){x.attr(n,J)}});for(I in G.params){x.attr(I,G.params[I])}x.attr({style:B,src:G.params.src});z.replace(x);return}if(this.editor.settings.media_use_script){x=new f("script",1).attr("type","text/javascript");y=new f("#text",3);y.value="write"+q.name+"("+h.serialize(tinymce.extend(G.params,{width:z.attr("width"),height:z.attr("height")}))+");";x.append(y);z.replace(x);return}if(q.name==="Video"&&G.video.sources[0]){C=new f("video",1).attr(tinymce.extend({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);for(A=0;AHello, Dolly in the upper right of your admin screen on every page. +Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Richard M. Stallman: Free Software. When activated you will randomly see a lyric from the Free Software Song in the upper right of your admin screen on every page. Author: Matt Mullenweg diff --git a/wordpress.spec b/wordpress.spec index 640918d..78bbd35 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -4,10 +4,10 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.5.2 +Version: 3.6 Group: Applications/Publishing #Release: 0.5.%{betatag}%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 #Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -20,6 +20,11 @@ Patch0: wordpress-debian_patches_hello.patch # Move wp-content to /var/www/wordpress/ # This patch doesn’t work well, see bugzilla.redhat.com/522897 Patch1: wordpress-move-wp-content.patch +# Drop swfupload: not built from source, not reasonably possible to do +Patch2: wordpress-3.6-no_swfupload.patch +# Adjust tinymce's media plugin not to use its SWF plugin +Patch3: wordpress-3.6-tinymce_noflash.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -70,8 +75,23 @@ almost trivial, to get information out to people on the web. %prep %setup -q -n wordpress +# Drop pre-compiled binary lumps: Flash and Silverlight +# This means that Flash video fallbacks in Wordpress' media support +# and the tinymce plugin, the plupload Flash and Silverlight +# uploaders, and swfupload are not available. +# To re-introduce these they would have to be built from the +# ActionScript source as part of this package build, they cannot be +# shipped pre-compiled. - AdamW, 2013/08 +# https://fedoraproject.org/wiki/Packaging:Guidelines#No_inclusion_of_pre-built_binaries_or_libraries + +rm -f wp-includes/js/mediaelement/silverlightmediaelement.xap ./wp-includes/js/plupload/plupload.silverlight.xap wp-includes/js/tinymce/plugins/media/moxieplayer.swf wp-includes/js/mediaelement/flashmediaelement.swf wp-includes/js/plupload/plupload.flash.swf +# swfupload can just die in its entirety +rm -rf wp-includes/js/swfupload + %patch0 -p1 -b .dolly #%patch1 -p1 -b .rhbz522897 +%patch2 -p1 +%patch3 -p1 # disable wp_version_check, updates are always installed via rpm sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \ @@ -83,9 +103,6 @@ sed -i -e "s,\(.*\)'update_nag'\(.*\),#\1'update_nag'\2,g; \ # fix file encoding sed -i -e 's/\r//' license.txt -# Drop .htaccess (moved in wordpress-httpd-conf) -rm wp-content/plugins/akismet/.htaccess - %build %install @@ -170,6 +187,10 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Thu Aug 22 2013 Adam Williamson - 3.6.0-1 +- update to 3.6.0 +- drop pre-compiled Flash and Silverlight binaries - #1000267 + * Sun Aug 04 2013 Fedora Release Engineering - 3.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild