From eea70a17c8df056be70647c83d2176b807bf520f Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Sep 03 2022 00:40:06 +0000 Subject: update to 1.2.0, rebuild for R 4.2.1, bootstrap on --- diff --git a/.gitignore b/.gitignore index 4a31575..dbef37c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /crosstalk_1.1.0.1.tar.gz /crosstalk_1.1.1.tar.gz +/crosstalk_1.2.0.tar.gz diff --git a/R-crosstalk.spec b/R-crosstalk.spec index ed272ca..9a30c57 100644 --- a/R-crosstalk.spec +++ b/R-crosstalk.spec @@ -1,10 +1,10 @@ %global packname crosstalk -%global packver 1.1.1 +%global packver 1.2.0 %global rlibdir %{_datadir}/R/library Name: R-%{packname} -Version: 1.1.1 -Release: 5%{?dist} +Version: %{packver} +Release: 1%{?dist} Summary: Inter-Widget Interactivity for HTML Widgets # Mostly MIT, selectize.js is ASL 2.0 @@ -12,7 +12,7 @@ License: MIT and ASL 2.0 URL: https://CRAN.R-project.org/package=%{packname} Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz # Remove extra glyphicons references; Fedora only; -Patch0001: 0001-Remove-non-ttf-font-references.patch +# Patch0001: 0001-Remove-non-ttf-font-references.patch # Here's the R view of the dependencies world: # Depends: @@ -31,12 +31,14 @@ BuildRequires: R-R6 BuildRequires: R-shiny BuildRequires: R-ggplot2 BuildRequires: R-testthat >= 2.1.0 +BuildRequires: R-sass +BuildRequires: R-bslib # MIT; inst/lib/bootstrap/ # https://github.com/twbs/bootstrap/releases/tag/v3.4.1 Provides: bundled(xstatic-bootstrap-common) = 3.4.1 -BuildRequires: glyphicons-halflings-fonts -Requires: glyphicons-halflings-fonts +# BuildRequires: glyphicons-halflings-fonts +# Requires: glyphicons-halflings-fonts # MIT; inst/lib/ionrangeslider Provides: bundled(js-IonDen-ionrangeslider) = 2.1.2 @@ -59,9 +61,9 @@ linked brushing and filtering. %prep %setup -q -c -n %{packname} -pushd %{packname} -%patch0001 -p1 -popd +# pushd %{packname} +# %%patch0001 -p1 +# popd %build @@ -73,12 +75,12 @@ mkdir -p %{buildroot}%{rlibdir} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -f %{buildroot}%{rlibdir}/R.css -pushd %{buildroot}%{rlibdir}/%{packname} +# pushd %{buildroot}%{rlibdir}/%{packname} # Replace fonts by system fonts (note that this cannot be done in prep because # R CMD INSTALL copies symlink targets.) -ln -sf %{_datadir}/fonts/glyphicons-halflings/glyphicons-halflings-regular.ttf \ - lib/bootstrap/fonts/glyphicons-halflings-regular.ttf -popd +# ln -sf %{_datadir}/fonts/glyphicons-halflings/glyphicons-halflings-regular.ttf \ +# lib/bootstrap/fonts/glyphicons-halflings-regular.ttf +# popd %check @@ -101,6 +103,10 @@ popd %changelog +* Fri Sep 2 2022 Tom Callaway - 1.2.0-1 +- update to 1.2.0 +- rebuild for R 4.2.1 + * Wed Jul 20 2022 Fedora Release Engineering - 1.1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 2957bb2..878ccec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crosstalk_1.1.1.tar.gz) = 49042a544855c9bf13a2703f26d6347d9c9d114272f15a2cf4202fe677913fedd7b5899b4fc719f599ed8dc63cba9ad29fefb7f83a2bc2cf5845ecf9896f72d0 +SHA512 (crosstalk_1.2.0.tar.gz) = b14eeb88f0d0e57b3637e3fa69b16a9c82e191c9f1b39f75ed7c74b34a5d68585c5a9064576fb0d50429276cc6d9046ec7e385a6f494653f6d1517e91cbc7a7f