Re-bundle js-jquery1.

This commit is contained in:
Elliott Sales de Andrade 2020-08-06 04:45:32 -04:00
parent fd98e37617
commit 9536f6214e

View File

@ -3,8 +3,8 @@
%global rlibdir %{_libdir}/R/library %global rlibdir %{_libdir}/R/library
Name: R-%{packname} Name: R-%{packname}
Version: %{packver} Version: 0.3.6
Release: 5%{?dist} Release: 6%{?dist}
Summary: Interactive Visualizations for Profiling R Code Summary: Interactive Visualizations for Profiling R Code
License: GPLv3 License: GPLv3
@ -30,13 +30,8 @@ BuildRequires: R-devtools
BuildRequires: R-shiny BuildRequires: R-shiny
BuildRequires: R-htmltools BuildRequires: R-htmltools
# This is broken in Fedora.
Provides: bundled(js-highlight) = 6.2.0 Provides: bundled(js-highlight) = 6.2.0
Provides: bundled(js-jquery1) = 1.12.4
BuildRequires: js-jquery1 >= 1.12.4
Requires: js-jquery1 >= 1.12.4
# Not available in Fedora.
Provides: bundled(js-d3) = 3.5.6 Provides: bundled(js-d3) = 3.5.6
%description %description
@ -56,13 +51,6 @@ mkdir -p %{buildroot}%{rlibdir}
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -f %{buildroot}%{rlibdir}/R.css rm -f %{buildroot}%{rlibdir}/R.css
# Unbundle things; can't be done before install since it copies symlink targets.
# jQuery 1
rm %{buildroot}%{rlibdir}/%{packname}/htmlwidgets/lib/jquery/jquery.min.js
ln -s /usr/share/javascript/jquery/1/jquery.min.js \
%{buildroot}%{rlibdir}/%{packname}/htmlwidgets/lib/jquery/jquery.min.js
%check %check
%{_bindir}/R CMD check %{packname} %{_bindir}/R CMD check %{packname}
@ -88,6 +76,9 @@ ln -s /usr/share/javascript/jquery/1/jquery.min.js \
%changelog %changelog
* Thu Aug 06 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.3.6-6
- Re-bundle js-jquery1, fixes rhbz#1866721
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.6-5 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.6-5
- Second attempt - Rebuilt for - Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild