diff --git a/.gitignore b/.gitignore index 84f7b58..00cde1f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /data.table_1.12.6.tar.gz /data.table_1.12.8.tar.gz /data.table_1.13.0.tar.gz +/data.table_1.13.2.tar.gz diff --git a/0001-Fix-test-1729-on-ppc64le.patch b/0001-Fix-test-1729-on-ppc64le.patch index 20813a4..51f769b 100644 --- a/0001-Fix-test-1729-on-ppc64le.patch +++ b/0001-Fix-test-1729-on-ppc64le.patch @@ -1,7 +1,7 @@ -From f02279985b388aeb5d9c58f6fb82fea423fd477b Mon Sep 17 00:00:00 2001 +From 2b7d22502ba52132e97f04ada1766e1d341f043b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 13 Nov 2019 20:49:24 -0500 -Subject: [PATCH 1/3] Fix test 1729 on ppc64le. +Subject: [PATCH] Fix test 1729 on ppc64le. Signed-off-by: Elliott Sales de Andrade --- @@ -9,33 +9,33 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inst/tests/tests.Rraw b/inst/tests/tests.Rraw -index d287a398..de883b37 100644 +index f5f71366..f211f62f 100644 --- a/inst/tests/tests.Rraw +++ b/inst/tests/tests.Rraw -@@ -10342,7 +10342,7 @@ test(1729.05, nrow(DT), 507L) +@@ -10472,7 +10472,7 @@ if (test_longdouble) { #3258 + test(1729.05, nrow(DT), 507L) - options(datatable.verbose = FALSE) # capture.output() exact tests must not be polluted with verbosity - x = capture.output(fwrite(DT,na="NA"))[-1] # -1 to remove the column name V1 --y = capture.output(write.csv(DT,row.names=FALSE,quote=FALSE))[-1] -+y = gsub("\\.?0+e", "e", capture.output(write.csv(DT,row.names=FALSE,quote=FALSE))[-1]) - # One mismatch that seems to be accuracy in base R's write.csv - # tmp = cbind(row=1:length(x), `fwrite`=x, `write.csv`=y) - # tmp[x!=y,] -@@ -10388,12 +10388,12 @@ if (isTRUE(LD<-capabilities()["long.double"])) { #3258 - cat('Skipped test 1729.9 due to capabilities()["long.double"] ==', LD, '\n') + x = capture.output(fwrite(DT,na="NA"))[-1] # -1 to remove the column name V1 +- y = capture.output(write.csv(DT,row.names=FALSE,quote=FALSE))[-1] ++ y = gsub("\\.?0+e", "e", capture.output(write.csv(DT,row.names=FALSE,quote=FALSE))[-1]) + # One mismatch that seems to be accuracy in base R's write.csv + # tmp = cbind(row=1:length(x), `fwrite`=x, `write.csv`=y) + # tmp[x!=y,] +@@ -10515,12 +10515,12 @@ if (test_longdouble) { #3258 + "0 00000001010 000101000110010100110011101010000110 00111110 01010001", + "0 11111110100 011001101011100100100011110110110000 01001110 01011101")) + test(1729.10, fwrite(DT,na=""), output=ans) +- test(1729.11, write.csv(DT,row.names=FALSE,quote=FALSE), output=ans) ++ test(1729.11, gsub("\\.?0+e", "e", capture.output(write.csv(DT,row.names=FALSE,quote=FALSE))), ans) + DT = data.table(unlist(.Machine[c("double.eps","double.neg.eps","double.xmin","double.xmax")])) + # double.eps double.neg.eps double.xmin double.xmax + # 2.220446e-16 1.110223e-16 2.225074e-308 1.797693e+308 + test(1729.12, typeof(DT[[1L]]), "double") +- test(1729.13, capture.output(fwrite(DT)), capture.output(write.csv(DT,row.names=FALSE,quote=FALSE))) ++ test(1729.13, capture.output(fwrite(DT)), gsub("\\.?0+e", "e", capture.output(write.csv(DT,row.names=FALSE,quote=FALSE)))) + + options(old) # restore the previous datatable.verbose value, for example for the CRAN_Release test with verbose on } - test(1729.10, fwrite(DT,na=""), output=ans) --test(1729.11, write.csv(DT,row.names=FALSE,quote=FALSE), output=ans) -+test(1729.11, gsub("\\.?0+e", "e", capture.output(write.csv(DT,row.names=FALSE,quote=FALSE))), ans) - DT = data.table(unlist(.Machine[c("double.eps","double.neg.eps","double.xmin","double.xmax")])) - # double.eps double.neg.eps double.xmin double.xmax - # 2.220446e-16 1.110223e-16 2.225074e-308 1.797693e+308 - test(1729.12, typeof(DT[[1L]]), "double") --test(1729.13, capture.output(fwrite(DT)), capture.output(write.csv(DT,row.names=FALSE,quote=FALSE))) -+test(1729.13, capture.output(fwrite(DT)), gsub("\\.?0+e", "e", capture.output(write.csv(DT,row.names=FALSE,quote=FALSE)))) - - if (test_bit64) { - test(1730.1, typeof(-2147483647L), "integer") -- -2.21.0 +2.26.2 diff --git a/R-data.table.spec b/R-data.table.spec index 6c1a35f..e64b961 100644 --- a/R-data.table.spec +++ b/R-data.table.spec @@ -1,5 +1,5 @@ %global packname data.table -%global packver 1.13.0 +%global packver 1.13.2 %global rlibdir %{_libdir}/R/library %global __suggests_exclude ^R\\((xts)\\) @@ -8,8 +8,8 @@ %global with_loop 0 Name: R-%{packname} -Version: 1.13.0 -Release: 3%{?dist} +Version: 1.13.2 +Release: 1%{?dist} Summary: Extension of `data.frame` License: MPLv2.0 @@ -48,6 +48,14 @@ columns, friendly and fast character-separated-value read/write. Offers a natural and flexible syntax, for faster development. +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Development files for %{name}. + + %prep %setup -q -c -n %{packname} @@ -104,8 +112,14 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} %dir %{rlibdir}/%{packname}/po/zh_CN/LC_MESSAGES %lang(zh_CN) %{rlibdir}/%{packname}/po/zh_CN/LC_MESSAGES/*.mo +%files devel +%{rlibdir}/%{packname}/include + %changelog +* Tue Oct 20 2020 Elliott Sales de Andrade - 1.13.2-1 +- Update to latest version (#1889519) + * Sat Aug 01 2020 Fedora Release Engineering - 1.13.0-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 4e9c0a7..732024e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (data.table_1.13.0.tar.gz) = a56e8a5921c3c1d488bbc022a4ba56ec55d1bfe7ac6b783a642d4c8bfeae3668be5727c4f65dc12271ce7c1763612657a969cd54d5e06438874a4f2be5164cfa +SHA512 (data.table_1.13.2.tar.gz) = c1ba48aea2b11dde2cc36dea334feed1ae8e0ce7559fa53c411ca26fd0775b3e7238da9398c8168ad4ca7418371326da1d3a0da2709dbc13f3a23e6019f86325