From 662651389c3ae1fb8f05cecfb3a50b5c9b697556 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 3 Jun 2020 12:28:05 -0400 Subject: [PATCH] conditionalize tests, update to 0.6.25, rebuild for R 4 --- .gitignore | 1 + R-digest.spec | 15 +++++++++++++-- sources | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1cda3f3..62bc69c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /digest_0.6.12.tar.gz /digest_0.6.15.tar.gz /digest_0.6.22.tar.gz +/digest_0.6.25.tar.gz diff --git a/R-digest.spec b/R-digest.spec index 9c47b30..1af57fb 100644 --- a/R-digest.spec +++ b/R-digest.spec @@ -1,16 +1,20 @@ +%bcond_with check + %global packname digest -%global packver 0.6.22 +%global packver 0.6.25 Name: R-%{packname} Version: %{packver} -Release: 2%{?dist} +Release: 1%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{packver}.tar.gz License: GPLv2+ and BSD and MIT and zlib URL: http://cran.r-project.org/web/packages/digest/index.html Summary: Create Cryptographic Hash Digest of R Objects BuildRequires: R-devel >= 3.4.0, tetex-latex +%if %{with check} # Test requires: BuildRequires: R-rmarkdown, R-knitr, R-tinytest +%endif Provides: bundled(xxhash) %description @@ -49,10 +53,12 @@ test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css %check +%if %{with check} # s390x fails this check in spooky ways %ifnarch s390x %{_bindir}/R CMD check %{packname} %endif +%endif %files %license %{_libdir}/R/library/%{packname}/GPL-2 @@ -73,6 +79,11 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css %{_libdir}/R/library/%{packname}/include/ %changelog +* Wed Jun 3 2020 Tom Callaway - 0.6.25-1 +- conditionalize tests +- update to 0.6.25 +- rebuild for R 4 + * Tue Jan 28 2020 Fedora Release Engineering - 0.6.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 0e16b62..4dbc587 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (digest_0.6.22.tar.gz) = 8b538dcbe7b7c4907986cd45bb37de17c179c909e0e2db9ad3cad125a81ecc86bc79a0314a7ab5a88180955995ab214d734a4c38fe384700159e50fb720eb028 +SHA512 (digest_0.6.25.tar.gz) = 5fb3683a3d20740aee0c98bdd52e60ebad3e7c7ca8db770d360aebf138b81f1623b70cdb382b2b32c5b7b59dbeef529cc2a75a7c5421c8be90c08c5a46bb1bc1