From 51b3003746c5738848e43afe3661735be32671a9 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 12 Sep 2020 06:30:17 -0400 Subject: [PATCH] Update to latest version. --- .gitignore | 1 + R-dplyr.spec | 76 +++++++++++++++++++++++----------------------------- sources | 2 +- 3 files changed, 36 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 62abe1f..2fb5888 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /dplyr_0.8.3.tar.gz /dplyr_0.8.4.tar.gz /dplyr_0.8.5.tar.gz +/dplyr_1.0.2.tar.gz diff --git a/R-dplyr.spec b/R-dplyr.spec index 920a849..f26aa23 100644 --- a/R-dplyr.spec +++ b/R-dplyr.spec @@ -1,5 +1,5 @@ %global packname dplyr -%global packver 0.8.5 +%global packver 1.0.2 %global rlibdir %{_libdir}/R/library %global __suggests_exclude ^R\\((Lahman|RMySQL|RPostgreSQL)\\) @@ -8,8 +8,8 @@ %bcond_with bootstrap Name: R-%{packname} -Version: 0.8.5 -Release: 3%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: A Grammar of Data Manipulation License: MIT @@ -18,69 +18,60 @@ Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}. # Here's the R view of the dependencies world: # Depends: -# Imports: R-ellipsis, R-assertthat >= 0.2.0, R-glue >= 1.3.0, R-magrittr >= 1.5, R-methods, R-pkgconfig, R-R6, R-Rcpp >= 1.0.1, R-rlang >= 0.4.0, R-tibble >= 2.0.0, R-tidyselect >= 0.2.5, R-utils -# Suggests: R-bit64, R-callr, R-covr, R-crayon >= 1.3.4, R-DBI, R-dbplyr, R-dtplyr, R-ggplot2, R-hms, R-knitr, R-Lahman, R-lubridate, R-MASS, R-mgcv, R-microbenchmark, R-nycflights13, R-rmarkdown, R-RMySQL, R-RPostgreSQL, R-RSQLite, R-testthat, R-withr, R-broom, R-purrr, R-readr -# LinkingTo: R-BH, R-plogr >= 0.2.0, R-Rcpp >= 1.0.1 +# Imports: R-ellipsis, R-generics, R-glue >= 1.3.2, R-lifecycle >= 0.2.0, R-magrittr >= 1.5, R-methods, R-R6, R-rlang >= 0.4.7, R-tibble >= 2.1.3, R-tidyselect >= 1.1.0, R-utils, R-vctrs >= 0.3.2 +# Suggests: R-bench, R-broom, R-callr, R-covr, R-DBI, R-dbplyr >= 1.4.3, R-knitr, R-Lahman, R-lobstr, R-microbenchmark, R-nycflights13, R-purrr, R-rmarkdown, R-RMySQL, R-RPostgreSQL, R-RSQLite, R-testthat >= 2.1.0, R-withr +# LinkingTo: # Enhances: BuildRequires: R-devel BuildRequires: tex(latex) BuildRequires: R-ellipsis -BuildRequires: R-assertthat >= 0.2.0 -BuildRequires: R-glue >= 1.3.0 +BuildRequires: R-generics +BuildRequires: R-glue >= 1.3.2 +BuildRequires: R-lifecycle >= 0.2.0 BuildRequires: R-magrittr >= 1.5 BuildRequires: R-methods -BuildRequires: R-pkgconfig BuildRequires: R-R6 -BuildRequires: R-Rcpp-devel >= 1.0.1 -BuildRequires: R-rlang >= 0.4.0 -BuildRequires: R-tibble >= 2.0.0 -BuildRequires: R-tidyselect >= 0.2.5 +BuildRequires: R-rlang >= 0.4.7 +BuildRequires: R-tibble >= 2.1.3 +BuildRequires: R-tidyselect >= 1.1.0 BuildRequires: R-utils -BuildRequires: R-BH-devel -BuildRequires: R-plogr-devel >= 0.2.0 -BuildRequires: R-bit64 +BuildRequires: R-vctrs >= 0.3.2 BuildRequires: R-callr -BuildRequires: R-crayon >= 1.3.4 BuildRequires: R-DBI -BuildRequires: R-hms BuildRequires: R-knitr -BuildRequires: R-lubridate -BuildRequires: R-MASS -BuildRequires: R-mgcv +BuildRequires: R-lobstr BuildRequires: R-microbenchmark +BuildRequires: R-purrr BuildRequires: R-rmarkdown BuildRequires: R-RSQLite -BuildRequires: R-testthat +BuildRequires: R-testthat >= 2.1.0 BuildRequires: R-withr -BuildRequires: R-purrr -BuildRequires: R-readr %if %{without bootstrap} -BuildRequires: R-dbplyr -BuildRequires: R-dtplyr -BuildRequires: R-ggplot2 -BuildRequires: R-nycflights13 +BuildRequires: R-bench BuildRequires: R-broom +BuildRequires: R-dbplyr >= 1.4.3 +BuildRequires: R-nycflights13 %endif +Obsoletes: %{name}-devel < 0.8.5-4 + %description A fast, consistent tool for working with data frame like objects, both in memory and out of memory. -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -Development files for %{name}. - - %prep %setup -q -c -n %{packname} # Don't need coverage; it's not packaged either. -sed -i 's/covr, //g' %{packname}/DESCRIPTION +# Lahman is not yet packaged. +# RMySQL/RPostgreSQL are old wrappers, so won't be packaged by me at least. +sed -i \ + -e 's/covr, //g' \ + -e 's/Lahman, //g' \ + -e 's/RMySQL, RPostgreSQL, //g' \ + %{packname}/DESCRIPTION %build @@ -96,8 +87,9 @@ rm -f %{buildroot}%{rlibdir}/R.css %check export LANG=C.UTF-8 %if %{without bootstrap} -# We need this because not all the suggests have the corresponding packages in Fedora -_R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} --no-examples +%{_bindir}/R CMD check %{packname} +%else +_R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} %endif @@ -117,11 +109,11 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} --no-examples %dir %{rlibdir}/%{packname}/libs %{rlibdir}/%{packname}/libs/%{packname}.so -%files devel -%{rlibdir}/%{packname}/include - %changelog +* Sat Sep 12 2020 Elliott Sales de Andrade - 1.0.2-1 +- Update to latest version (#1841868) + * Mon Jul 27 2020 Fedora Release Engineering - 0.8.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 2ea775c..909ef8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dplyr_0.8.5.tar.gz) = 08269e59c43aacc5959d516c1fed45d3dbbe0912aa92263ff8eda6454f216a739ea5989088852cf2ab60bf06fc8aea524557258df786e16b81f5f785cb627105 +SHA512 (dplyr_1.0.2.tar.gz) = b0518fc6dd00dfa713ca08d207fd151b3de66486911296cf7dd0a5f40b26abc419f90c5748ecda8b7aad9c88372956cbbd1c6517510d6a4e89526054a50a2493