From c07a4b88604e2a561de50ab3ea7748cecb66bf1c Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Aug 30 2018 19:45:09 +0000 Subject: Update to version 5.5.1 --- diff --git a/js-jsroot-mathjax.patch b/js-jsroot-mathjax.patch index 791a828..ca84de1 100644 --- a/js-jsroot-mathjax.patch +++ b/js-jsroot-mathjax.patch @@ -1,7 +1,7 @@ -diff -ur jsroot-5.3.4.orig/scripts/JSRootCore.js jsroot-5.3.4/scripts/JSRootCore.js ---- jsroot-5.3.4.orig/scripts/JSRootCore.js 2017-12-19 10:58:30.000000000 +0100 -+++ jsroot-5.3.4/scripts/JSRootCore.js 2017-12-25 10:14:44.110127880 +0100 -@@ -16,9 +16,9 @@ +diff -ur jsroot-5.5.1.orig/scripts/JSRootCore.js jsroot-5.5.1/scripts/JSRootCore.js +--- jsroot-5.5.1.orig/scripts/JSRootCore.js 2018-08-20 11:11:00.000000000 +0200 ++++ jsroot-5.5.1/scripts/JSRootCore.js 2018-08-30 20:55:03.259023811 +0200 +@@ -13,9 +13,9 @@ 'jquery' : dir+'jquery.min', 'jquery-ui' : dir+'jquery-ui.min', 'jqueryui-mousewheel' : dir+'jquery.mousewheel.min', @@ -13,7 +13,7 @@ diff -ur jsroot-5.3.4.orig/scripts/JSRootCore.js jsroot-5.3.4/scripts/JSRootCore 'saveSvgAsPng' : dir+'saveSvgAsPng.min', 'dat.gui' : dir+'dat.gui.min', 'threejs' : dir+'three.min', -@@ -42,8 +42,6 @@ +@@ -43,8 +43,6 @@ if (norjs) { // just define locations @@ -22,18 +22,7 @@ diff -ur jsroot-5.3.4.orig/scripts/JSRootCore.js jsroot-5.3.4/scripts/JSRootCore require({ paths: paths }); } else { var cfg_paths; -@@ -834,10 +832,6 @@ - if (filename.indexOf("$$$")===0) { - isrootjs = true; - filename = filename.slice(3); -- if ((filename.indexOf("style/")==0) && JSROOT.source_min && -- (filename.lastIndexOf('.css')==filename.length-4) && -- (filename.indexOf('.min.css')<0)) -- filename = filename.slice(0, filename.length-4) + '.min.css'; - } else - if (filename.indexOf("###")===0) { - isbower = true; -@@ -1077,7 +1071,7 @@ +@@ -1246,7 +1244,7 @@ if (kind.indexOf("mathjax;")>=0) { if (typeof MathJax == 'undefined') { @@ -42,12 +31,7 @@ diff -ur jsroot-5.3.4.orig/scripts/JSRootCore.js jsroot-5.3.4/scripts/JSRootCore "?config=TeX-AMS-MML_SVG&delayStartupUntil=configured"; modules.push('MathJax'); -@@ -1116,11 +1110,11 @@ - jsroot.console('Reuse existing jQuery-ui ' + $.ui.version + ", required 1.12.1", debugout); - else { - lst_jq += (use_bower ? "###jquery-ui" : "&&&scripts") + '/jquery-ui.min.js;'; -- extrafiles += '$$$style/jquery-ui' + ext + '.css;'; -+ extrafiles += '$$$style/jquery-ui.css;'; +@@ -1289,7 +1287,7 @@ } if (jsroot.touches) { diff --git a/js-jsroot.spec b/js-jsroot.spec index 89384e3..6a9955e 100644 --- a/js-jsroot.spec +++ b/js-jsroot.spec @@ -1,7 +1,7 @@ %global jsname jsroot Name: js-%{jsname} -Version: 5.5.0 +Version: 5.5.1 Release: 1%{?dist} Summary: JavaScript ROOT - Interactive numerical data analysis graphics @@ -10,7 +10,6 @@ License: MIT and BSD URL: https://jsroot.gsi.de/ Source0: https://github.com/root-project/%{jsname}/archive/%{version}/%{jsname}-%{version}.tar.gz # Use locally installed mathjax instead of remote installation. -# Plus some adaptations due to unbundling of jquery et al. Patch0: %{name}-mathjax.patch BuildArch: noarch @@ -123,6 +122,8 @@ install -m 644 -p style/*.css %{buildroot}%{_jsdir}/%{jsname}/style ln -s %{_jsdir}/jquery_ui/jquery-ui.css \ %{buildroot}%{_jsdir}/%{jsname}/style +ln -s %{_jsdir}/jquery_ui/jquery-ui.min.css \ + %{buildroot}%{_jsdir}/%{jsname}/style ln -s %{_jsdir}/jquery_ui/images \ %{buildroot}%{_jsdir}/%{jsname}/style @@ -156,6 +157,9 @@ ln -s %{_jsdir}/%{jsname}/img %{buildroot}%{_pkgdocdir} %doc changes.md demo docs/* index.htm readme.md %changelog +* Thu Aug 30 2018 Mattias Ellert - 5.5.1-1 +- Update to version 5.5.1 + * Fri Jul 20 2018 Mattias Ellert - 5.5.0-1 - Update to version 5.5.0 - Change dependency to js-jquery since js-jquery2 is orphaned diff --git a/sources b/sources index 2391546..eeae8b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jsroot-5.5.0.tar.gz) = fdf88399525be7737bf97d36bbcb7765c3223fa0f9cae6662a7dc6192dd0d51b80980c16d726e306d0044018ebae8100dcb91de64e9b605ca05388f9ff778c37 +SHA512 (jsroot-5.5.1.tar.gz) = a58abc6dd55fa427c111bacb1dae52769b74ba2d16d1a8a60dfce06c1094d850cfe564e1523e1e26e42df45af1c9dc3aee08be749d9ec40b0b1df9be337a2582