[owncloud] - update to 6.0.2 - adjust videoviewer_noplugins patch
brummbq
brummbq at fedoraproject.org
Tue Mar 4 20:48:23 UTC 2014
commit edd94833a594dd32fe1ac573d2df8c3139daf236
Author: Gregor Tätzner <gregor at freenet.de>
Date: Tue Mar 4 21:47:16 2014 +0100
- update to 6.0.2
- adjust videoviewer_noplugins patch
.gitignore | 1 +
...h => owncloud-6.0.2-videoviewer_noplugins.patch | 18 +++++++++---------
owncloud.spec | 13 ++++++++-----
sources | 2 +-
4 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 00f705c..22e66d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
/owncloud-6.0.0-repack.tar.bz2
/owncloud-6.0.0a-repack.tar.bz2
/owncloud-6.0.1-repack.tar.bz2
+/owncloud-6.0.2-repack.tar.bz2
diff --git a/owncloud-4.5.13-videoviewer_noplugins.patch b/owncloud-6.0.2-videoviewer_noplugins.patch
similarity index 51%
rename from owncloud-4.5.13-videoviewer_noplugins.patch
rename to owncloud-6.0.2-videoviewer_noplugins.patch
index 96c3950..fb8dfd5 100644
--- a/owncloud-4.5.13-videoviewer_noplugins.patch
+++ b/owncloud-6.0.2-videoviewer_noplugins.patch
@@ -1,11 +1,11 @@
---- owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js 2013-07-09 23:58:09.000000000 -0700
-+++ owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js.new 2013-08-23 17:34:23.917811207 -0700
-@@ -36,7 +36,7 @@
+--- apps/files_videoviewer/js/mediaelement-and-player.min.js.orig 2014-03-04 21:35:13.921783071 +0100
++++ apps/files_videoviewer/js/mediaelement-and-player.min.js 2014-03-04 21:39:40.528053899 +0100
+@@ -38,7 +38,7 @@
this.attributes},removeAttribute:function(a){delete this.attributes[a]},getAttribute:function(a){if(this.hasAttribute(a))return this.attributes[a];return""},setAttribute:function(a,b){this.attributes[a]=b},remove:function(){mejs.Utility.removeSwf(this.pluginElement.id);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;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,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,
-+mejs.MediaElementDefaults={mode:"auto",plugins:["youtube","vimeo"],enablePluginDebug: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(),f=e==="audio"||e==="video",g=f?d.getAttribute("src"):d.getAttribute("href");e=d.getAttribute("poster");var h=d.getAttribute("autoplay"),l=d.getAttribute("preload"),j=d.getAttribute("controls"),k;for(k in b)c[k]=b[k];g=typeof g=="undefined"||g===null||g==""?null:g;e=typeof e=="undefined"||e===null?"":e;l=typeof l=="undefined"||l===null||l==="false"?
- "none":l;h=!(typeof h=="undefined"||h===null||h==="false");j=!(typeof j=="undefined"||j===null||j==="false");k=this.determinePlayback(d,c,mejs.MediaFeatures.supportsMediaTag,f,g);k.url=k.url!==null?mejs.Utility.absolutizeUrl(k.url):"";if(k.method=="native"){if(mejs.MediaFeatures.isBustedAndroid){d.src=k.url;d.addEventListener("click",function(){d.play()},false)}return this.updateNative(k,c,h,l)}else if(k.method!=="")return this.createPlugin(k,c,e,h,l,j);else{this.createErrorMessage(k,c,e);return this}},
+ 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 h=d.getAttribute("autoplay"),l=d.getAttribute("preload"),j=d.getAttribute("controls"),k;for(k in b)c[k]=b[k];f=typeof f=="undefined"||f===null||f==""?null:f;e=typeof e=="undefined"||e===null?"":e;l=typeof l=="undefined"||l===null||l==="false"?
+ "none":l;h=!(typeof h=="undefined"||h===null||h==="false");j=!(typeof j=="undefined"||j===null||j==="false");k=this.determinePlayback(d,c,mejs.MediaFeatures.supportsMediaTag,g,f);k.url=k.url!==null?mejs.Utility.absolutizeUrl(k.url):"";if(k.method=="native"){if(mejs.MediaFeatures.isBustedAndroid){d.src=k.url;d.addEventListener("click",function(){d.play()},false)}return this.updateNative(k,c,h,l)}else if(k.method!=="")return this.createPlugin(k,c,e,h,l,j);else{this.createErrorMessage(k,c,e);return this}},
diff --git a/owncloud.spec b/owncloud.spec
index 235ec10..9177270 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
Name: owncloud
-Version: 6.0.1
-Release: 3%{?dist}
+Version: 6.0.2
+Release: 1%{?dist}
Summary: Private file sync and share server
License: AGPLv3+ and MIT and BSD and CC-BY and CC-BY-SA and GPLv3 and Public Domain and (MPLv1.1 or GPLv2+ or LGPLv2+) and (MIT or GPL+) and (MIT or GPLv2) and ASL 2.0 and LGPLv3
@@ -23,7 +23,7 @@ Patch0: %{name}-6.0.0-config.patch
# Adjust mediaelement not to use its SWF and Silverlight plugins. This
# changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to
# 'plugins:["youtube","vimeo"]'
-Patch1: %{name}-4.5.13-videoviewer_noplugins.patch
+Patch1: %{name}-6.0.2-videoviewer_noplugins.patch
# Merged upstream: https://github.com/owncloud/core/pull/6601
# https://github.com/owncloud/core/commit/9b4a827e0bd9dc02fe7f2c9487fed21f50447ea0
@@ -160,7 +160,7 @@ Requires: php-sqlite3 php-pcre
# Fix line endings of a file we're about to patch
sed -i 's/\r$//' apps/files_encryption/lib/crypt.php
%patch0
-%patch1 -p1
+%patch1
%patch10
%patch11
%patch12 -p1
@@ -227,7 +227,7 @@ rm -r apps/files_external/3rdparty/{Dropbox,irodsphp,phpseclib}
# clean up content
-rm -r apps/{files_videoviewer/mediaelement,documents}/src
+rm -r apps/documents/src
for f in {l10n.pl,init.sh,setup_owncloud.sh,image-optimization.sh,install_dependencies.sh}; do
find . -name "$f" -exec rm {} \;
done
@@ -367,6 +367,9 @@ fi
%changelog
+* Tue Mar 04 2014 Gregor Tätzner <brummbq at fedoraproject.org> - 6.0.2-1
+- 6.0.2
+
* Mon Feb 24 2014 Adam Williamson <awilliam at redhat.com> - 6.0.1-3
- set a minimum ver on the DBAL req for safety (using with 2.3 is dangerous)
diff --git a/sources b/sources
index 613e36b..6b1be70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4bf692a82792cea13e82e15089c456d6 owncloud-6.0.1-repack.tar.bz2
+b1e05095bc87d4c8d450470a780b387f owncloud-6.0.2-repack.tar.bz2
More information about the scm-commits
mailing list