From b6ec4f549f84918bfdac27a41ee6f83bf180956c Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Fri, 3 Mar 2023 17:24:10 -0500
Subject: [PATCH] update to 1.9.2

---
 .gitignore       |  1 +
 R-lubridate.spec | 34 ++++++++++++----------------------
 sources          |  2 +-
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95df70b..b570b49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /lubridate_1.7.9.2.tar.gz
 /lubridate_1.7.10.tar.gz
 /lubridate_1.8.0.tar.gz
+/lubridate_1.9.2.tar.gz
diff --git a/R-lubridate.spec b/R-lubridate.spec
index 569b857..1783ac4 100644
--- a/R-lubridate.spec
+++ b/R-lubridate.spec
@@ -1,42 +1,38 @@
 %global packname lubridate
-%global packver  1.8.0
+%global packver  1.9.2
 %global rlibdir  %{_libdir}/R/library
 
 Name:             R-%{packname}
 Version:          %{packver}
-Release:          2%{?dist}
+Release:          1%{?dist}
 Summary:          Make dealing with dates a little easier
-
-License:          GPLv2+ and ASL 2.0
+License:          GPL-2.0-or-later-version
 URL:              https://CRAN.R-project.org/package=%{packname}
 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-generics, R-Rcpp >= 0.12.13
-# Suggests:  R-covr, R-knitr, R-testthat >= 2.1.0, R-vctrs >= 0.3.0, R-rmarkdown
+# Imports:   R-generics, R-timechange >= 0.1.1
+# Suggests:  R-covr, R-knitr, R-rmarkdown, R-testthat >= 2.1.0, R-vctrs >= 0.5.0
 # LinkingTo:
 # Enhances:
 
-BuildRequires:    cctz-devel
 BuildRequires:    R-devel
 BuildRequires:    tex(latex)
 BuildRequires:    R-methods
 BuildRequires:    R-generics
-BuildRequires:    R-cpp11-devel >= 0.2.7
+BuildRequires:    R-timechange >= 0.1.1
 BuildRequires:    R-knitr
-BuildRequires:    R-testthat >= 2.1.0
-BuildRequires:    R-vctrs >= 0.3.0
 BuildRequires:    R-rmarkdown
+BuildRequires:    R-testthat >= 2.1.0
+BuildRequires:    R-vctrs >= 0.5.0
 
 %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 <https://github.com/google/cctz> for more details.
+memorable syntax that makes working with dates easy and fun.
 
 
 %prep
@@ -45,15 +41,6 @@ package. See <https://github.com/google/cctz> for more details.
 # Don't need coverage; it's not packaged either.
 sed -i 's/covr, //g' %{packname}/DESCRIPTION
 
-# Delete bundled cctz.
-rm -r %{packname}/src/cctz
-cat > %{packname}/src/Makevars << EOF
-CXX_STD = CXX11
-PKG_CPPFLAGS= -I. -I/usr/include/cctz
-PKG_LIBS= -lcctz
-EOF
-sed -i '/time_zone_if/d' %{packname}/src/update.cpp
-
 
 %build
 
@@ -91,6 +78,9 @@ rm %{buildroot}%{rlibdir}/%{packname}/cctz.sh
 
 
 %changelog
+* Fri Mar  3 2023 Tom Callaway <spot@fedoraproject.org> - 1.9.2-1
+- update to 1.9.2
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index 849fa63..2c3f517 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lubridate_1.8.0.tar.gz) = b873d27cd0381a0f30719657681b7f3da39246b3490179577e37d1d3b0376924d2689b96f0d3b42f7920646faba2259dbed73a0db3d485e005f88ee042c5d593
+SHA512 (lubridate_1.9.2.tar.gz) = bc983e5e5ff64f82b6d6af720de88ae80d72ec99ffbfb420672057b591dd8870d2676203dfe6784de6810ac6778bd64035c50ae3127fe356fcb2d89b61a9740b