.gitignore

@@ -1,2 +1 @@
 /profvis_0.3.6.tar.gz
-/profvis_0.3.7.tar.gz

R-profvis.spec

@@ -1,12 +1,10 @@
-%bcond_with bootstrap
-
 %global packname profvis
-%global packver  0.3.7
+%global packver  0.3.6
 %global rlibdir  %{_libdir}/R/library
 
 Name:             R-%{packname}
-Version:          %{packver}
-Release:          8%{?dist}
+Version:          0.3.6
+Release:          2%{?dist}
 Summary:          Interactive Visualizations for Profiling R Code
 
 License:          GPLv3
@@ -24,7 +22,6 @@ BuildRequires:    R-devel
 BuildRequires:    tex(latex)
 BuildRequires:    R-htmlwidgets >= 0.3.2
 BuildRequires:    R-stringr
-%if %{without bootstrap}
 BuildRequires:    R-knitr
 BuildRequires:    R-ggplot2
 BuildRequires:    R-rmarkdown
@@ -32,10 +29,14 @@ BuildRequires:    R-testthat
 BuildRequires:    R-devtools
 BuildRequires:    R-shiny
 BuildRequires:    R-htmltools
-%endif
 
+# This is broken in Fedora.
 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
 
 %description
@@ -55,11 +56,16 @@ mkdir -p %{buildroot}%{rlibdir}
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 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
-%if %{without bootstrap}
 %{_bindir}/R CMD check %{packname}
-%endif
 
 
 %files
@@ -75,66 +81,13 @@ rm -f %{buildroot}%{rlibdir}/R.css
 %{rlibdir}/%{packname}/help
 %dir %{rlibdir}/%{packname}/libs
 %{rlibdir}/%{packname}/libs/%{packname}.so
-%dir %{rlibdir}/%{packname}/htmlwidgets
+%{rlibdir}/%{packname}/htmlwidgets
 %license %{rlibdir}/%{packname}/htmlwidgets/lib/d3/LICENSE
 %license %{rlibdir}/%{packname}/htmlwidgets/lib/highlight/LICENSE
-%dir %{rlibdir}/%{packname}/htmlwidgets/lib/d3
-%{rlibdir}/%{packname}/htmlwidgets/lib/d3/d3.min.js
-%dir %{rlibdir}/%{packname}/htmlwidgets/lib/highlight
-%{rlibdir}/%{packname}/htmlwidgets/lib/highlight/default.css
-%{rlibdir}/%{packname}/htmlwidgets/lib/highlight/highlight.js
-%{rlibdir}/%{packname}/htmlwidgets/lib/highlight/textmate.css
-%{rlibdir}/%{packname}/htmlwidgets/lib/jquery/
-%{rlibdir}/%{packname}/htmlwidgets/lib/profvis/
-%{rlibdir}/%{packname}/htmlwidgets/profvis.js
-%{rlibdir}/%{packname}/htmlwidgets/profvis.yaml
 %{rlibdir}/%{packname}/shinymodule
 
 
 %changelog
-* Fri Apr 21 2023 Iñaki Úcar <iucar@fedoraproject.org> - 0.3.7-8
-- R-maint-sig mass rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.7-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Sep  1 2022 Tom Callaway <spot@fedoraproject.org> - 0.3.7-6
-- bootstrap on
-- rebuild for R 4.2.1
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jun 17 2021 Tom Callaway <spot@fedoraproject.org> - 0.3.7-2
-- bootstrap off
-
-* Tue Jun 15 2021 Tom Callaway <spot@fedoraproject.org> - 0.3.7-1
-- update to 0.3.7
-- bootstrap
-- Rebuilt for R 4.1.0
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.6-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* 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
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Jun  7 2020 Tom Callaway <spot@fedoraproject.org> - 0.3.6-3
-- rebuild for R 4
-
 * Sun Mar 22 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.3.6-2
 - Fix link to jQuery
 

sources

@@ -1 +1 @@
-SHA512 (profvis_0.3.7.tar.gz) = 9ae232def68e2d8a9ddd2e5fc20cee3ea05941a68bff6441ebe15e2f8eb14293d128056f01d46c662c680a86129822ab417356a5a73336bb08e4e6fad82f8483
+SHA512 (profvis_0.3.6.tar.gz) = 342cb62cdedd4ebb9a562ed504f473f778af3822bb02d114c082f7b1c867f7a6bdc8651e9cbe0c1b21d874989a0af9fc74d52145b5cf6bb6840888db17a78a4d