diff --git a/.gitignore b/.gitignore index c472e1c..cb36f6b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /rlang_0.4.9.tar.gz /rlang_0.4.10.tar.gz /rlang_0.4.11.tar.gz +/rlang_1.0.4.tar.gz diff --git a/0001-Unbundle-libxxhash.patch b/0001-Unbundle-libxxhash.patch index d84b834..7ed3299 100644 --- a/0001-Unbundle-libxxhash.patch +++ b/0001-Unbundle-libxxhash.patch @@ -16,8 +16,8 @@ index 4484e88f..4a4d549e 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,4 +1,4 @@ --PKG_CPPFLAGS = -I./lib/ -+PKG_CPPFLAGS = -I./lib/ $(pkgconf --cflags libxxhash) +-PKG_CPPFLAGS = -I./rlang/ ++PKG_CPPFLAGS = -I./rlang/ $(pkgconf --cflags libxxhash) PKG_CFLAGS = $(C_VISIBILITY) lib-files = \ diff --git a/R-rlang.spec b/R-rlang.spec index 740cc18..2090aeb 100644 --- a/R-rlang.spec +++ b/R-rlang.spec @@ -1,13 +1,13 @@ # When we are bootstrapping, we drop some dependencies, and/or build time tests. -%bcond_with bootstrap +%bcond_without bootstrap %global packname rlang -%global packver 0.4.11 +%global packver 1.0.4 %global rlibdir %{_libdir}/R/library Name: R-%{packname} -Version: 0.4.11 -Release: 5%{?dist} +Version: %{packver} +Release: 1%{?dist} Summary: Functions for Base Types and Core R and 'Tidyverse' Features License: MIT @@ -29,15 +29,19 @@ BuildRequires: R-devel BuildRequires: tex(latex) BuildRequires: R-utils %if %{without bootstrap} -BuildRequires: R-cli +BuildRequires: R-cli >= 3.1.0 BuildRequires: R-crayon +BuildRequires: R-fs BuildRequires: R-glue +BuildRequires: R-knitr BuildRequires: R-magrittr BuildRequires: R-methods -BuildRequires: R-pak BuildRequires: R-pillar BuildRequires: R-rmarkdown +BuildRequires: R-stats BuildRequires: R-testthat >= 3.0.0 +BuildRequires: R-tibble +BuildRequires: R-usethis BuildRequires: R-vctrs >= 0.2.3 BuildRequires: R-withr %endif @@ -94,6 +98,11 @@ export LANG=C.UTF-8 %changelog +* Thu Aug 18 2022 Tom Callaway - 1.0.4-1 +- update to 1.0.4 +- rebuild for R 4.2.1 +- bootstrap on + * Wed Jul 20 2022 Fedora Release Engineering - 0.4.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index d4de662..96e9bec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rlang_0.4.11.tar.gz) = 0448a104034a9f14dd735b1abfd3aa823abaad9a7ee96ca89393b15f2c54dd24f27712cb59e30393c3afeccb834471f3940259e864236212b3b4c797008d79b4 +SHA512 (rlang_1.0.4.tar.gz) = 9a847d36ef1d6d4ef1f1497691aa2129c5c7d234d59820c37e0f272b5f0c1b8baba0a8bcbdfd50a47bd0e6583513920f78126e001aaddfcb3c515d35c98667dc