diff --git a/.gitignore b/.gitignore index ef5f479..50202a7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /curl_4.2.tar.gz /curl_4.3.tar.gz /curl_4.3.1.tar.gz +/curl_4.3.2.tar.gz diff --git a/R-curl.spec b/R-curl.spec index b7b9ece..7111399 100644 --- a/R-curl.spec +++ b/R-curl.spec @@ -1,21 +1,18 @@ -%bcond_with check +%bcond_with bootstrap +%bcond_with network -%global packname curl +%global packname curl +%global packver 4.3.2 %global rlibdir %{_libdir}/R/library -# Dependency loops and/or not yet packaged. -%global with_doc 0 -# These all require the network at the moment + dependency loop. -%global with_test 0 - Name: R-%{packname} -Version: 4.3.1 +Version: 4.3.2 Release: %autorelease Summary: A Modern and Flexible Web Client for R License: MIT URL: https://CRAN.R-project.org/package=%{packname} -Source0: https://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz +Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz # Here's the R view of the dependencies world: # Depends: @@ -27,18 +24,16 @@ Source0: https://cran.r-project.org/src/contrib/%{packname}_%{version}. BuildRequires: R-devel BuildRequires: tex(latex) BuildRequires: pkgconfig(libcurl) -%if %{with check} +%if %{without bootstrap} BuildRequires: R-spelling BuildRequires: R-testthat >= 1.0.0 BuildRequires: R-jsonlite BuildRequires: R-httpuv >= 1.4.4 -%if %{with_doc} BuildRequires: R-knitr BuildRequires: glyphicons-halflings-fonts BuildRequires: R-rmarkdown BuildRequires: R-magrittr -%endif -%if %{with_test} +%if %{with network} BuildRequires: R-webutils %endif %endif @@ -70,19 +65,19 @@ rm -f %{buildroot}%{rlibdir}/R.css %check -%if %{with check} +%if %{without bootstrap} +export LANG=C.UTF-8 ARGS= -%if ! %{with_test} +%if %{without network} export _R_CHECK_FORCE_SUGGESTS_=0 -ARGS="$ARGS --no-tests --no-examples" +ARGS="$ARGS --no-tests --no-examples --ignore-vignettes" %endif -%if ! %{with_doc} export _R_CHECK_FORCE_SUGGESTS_=0 ARGS="$ARGS --ignore-vignettes" -%endif %{_bindir}/R CMD check %{packname} $ARGS %endif + %files %dir %{rlibdir}/%{packname} %doc %{rlibdir}/%{packname}/doc diff --git a/sources b/sources index 8aaaa90..ff32f38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl_4.3.1.tar.gz) = c935e115f4bb81e8b7b98d2736408e16ba3e10d67649834a37bbdbc1bcd0c6f3410344f7240161628e074cab70d3d8bd951f3df4abe1553df9947ad9353b1c62 +SHA512 (curl_4.3.2.tar.gz) = 7b8e9b136f206733a3314a876de21bf7d52b9bcef1c8c399fc9b0e1983a12853da18bd7ce06959fdd83957cd3637a11fc9246154187427a3c6479101cc492322