From 9140bad852e47298927aa00cc3b8d37bc0cfdf5b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 23 May 2020 23:24:18 -0400 Subject: [PATCH] Update to latest version. --- .gitignore | 1 + R-lubridate.spec | 40 ++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index a9fba0b..f90ae5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /lubridate_1.7.3.tar.gz /lubridate_1.7.4.tar.gz +/lubridate_1.7.8.tar.gz diff --git a/R-lubridate.spec b/R-lubridate.spec index 3b8f562..829110e 100644 --- a/R-lubridate.spec +++ b/R-lubridate.spec @@ -1,35 +1,31 @@ -%global packname lubridate +%global packname lubridate +%global packver 1.7.8 %global rlibdir %{_libdir}/R/library # knitr is not yet available. %global with_doc 1 Name: R-%{packname} -Version: 1.7.4 -Release: 7%{?dist} +Version: 1.7.8 +Release: 1%{?dist} Summary: Make dealing with dates a little easier License: GPLv2+ and ASL 2.0 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: R-methods -# Imports: R-stringr, R-Rcpp >= 0.12.13 -# Suggests: R-testthat, R-knitr, R-covr +# Imports: R-generics, R-Rcpp >= 0.12.13 +# Suggests: R-covr, R-knitr, R-testthat # LinkingTo: # Enhances: -Requires: tzdata -%if %{fedora} >= 28 BuildRequires: cctz-devel -%else -BuildRequires: tzdata -%endif BuildRequires: R-devel BuildRequires: tex(latex) BuildRequires: R-methods -BuildRequires: R-stringr +BuildRequires: R-generics BuildRequires: R-Rcpp-devel >= 0.12.13 BuildRequires: R-testthat %if %{with_doc} @@ -38,22 +34,20 @@ BuildRequires: R-knitr %description Functions to work with date-times and time-spans: fast and user friendly -parsing of date-time data, extraction and updating of components of a -date-time (years, months, days, hours, minutes, and seconds), algebraic -manipulation on date-time and time-span objects. The 'lubridate' package -has a consistent and memorable syntax that makes working with dates easy -and fun. Parts of the 'CCTZ' source code, released under the Apache 2.0 -License, are included in this package. See - for more details. +parsing of date-time data, extraction and updating of components of a date-time +(years, months, days, hours, minutes, and seconds), algebraic manipulation on +date-time and time-span objects. The 'lubridate' package has a consistent and +memorable syntax that makes working with dates easy and fun. Parts of the +'CCTZ' source code, released under the Apache 2.0 License, are included in this +package. See for more details. %prep %setup -q -c -n %{packname} # Don't need coverage; it's not packaged either. -sed -i 's/, covr//g' %{packname}/DESCRIPTION +sed -i 's/covr, //g' %{packname}/DESCRIPTION -%if %{fedora} >= 28 # Delete bundled cctz. rm -r %{packname}/src/cctz cat > %{packname}/src/Makevars << EOF @@ -62,7 +56,6 @@ PKG_CPPFLAGS= -I. -I/usr/include/cctz PKG_LIBS= -lcctz EOF sed -i '/time_zone_if/d' %{packname}/src/update.cpp -%endif %build @@ -105,6 +98,9 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} --ignore-vignettes %changelog +* Thu May 21 2020 Elliott Sales de Andrade - 1.7.8-1 +- Update to latest version + * Tue Jan 28 2020 Fedora Release Engineering - 1.7.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 091ddb1..662ec9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lubridate_1.7.4.tar.gz) = b77af2a16c07a24278bf59eab2231524f81c6f4ce92d9e8b5ffe3d4cb8fe8af229c8bbe1c94d596cb858c2f7cef83a7b99b6e15654402f12d911d887dc04ab5b +SHA512 (lubridate_1.7.8.tar.gz) = c5436639627c713d79733b11ad51319933a49a5283dab8c542201480dd6f58fb35768f11c74b91e096e0eb7c9264bfef8f267eef748fd2a8deee46584470df3d