From acfb257b5c9c082c2d1362e3dc139276196bf1bb Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Thu, 30 Apr 2020 12:10:06 -0400
Subject: [PATCH] Upgrade to calendar(1) from OpenBSD 6.6 Include missing
 calendar data files (#1809218)

Signed-off-by: David Cantrell <dcantrell@redhat.com>
---
 .gitignore                | 1 +
 calendar.spec             | 8 ++++++--
 export-calendar-source.sh | 2 +-
 sources                   | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 55156e2..4fa6455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ calendar-1.26-20110531cvs.tar.gz
 /calendar-1.35-20180719cvs.tar.gz
 /calendar-1.35-20190227cvs.tar.gz
 /calendar-1.37-20190827cvs.tar.gz
+/calendar-1.37-20200430cvs.tar.gz
diff --git a/calendar.spec b/calendar.spec
index f7cd501..01e5b93 100644
--- a/calendar.spec
+++ b/calendar.spec
@@ -1,9 +1,9 @@
-%define alphatag 20190827cvs
+%define alphatag 20200430cvs
 
 Summary: Reminder utility
 Name:    calendar
 Version: 1.37
-Release: 2.%{alphatag}%{?dist}
+Release: 1.%{alphatag}%{?dist}
 License: BSD
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
 
@@ -53,6 +53,10 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/calendar
 
 %changelog
+* Thu Apr 30 2020 David Cantrell <dcantrell@redhat.com> - 1.37-1.20200430cvs
+- Upgrade to calendar(1) from OpenBSD 6.6
+- Include missing calendar data files (#1809218)
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-2.20190827cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/export-calendar-source.sh b/export-calendar-source.sh
index 2d8c762..e635975 100755
--- a/export-calendar-source.sh
+++ b/export-calendar-source.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #TAG=HEAD
-TAG=OPENBSD_6_5
+TAG=OPENBSD_6_6
 
 CWD=$(pwd)
 CVS_RSH=ssh ; export CVS_RSH
diff --git a/sources b/sources
index 58f44c8..0538e3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calendar-1.37-20190827cvs.tar.gz) = 34976ba929f36cec606b3f78672f16efd22d5f066e6a03ca38d193ff9404afb5df4eae8c81e528ed8875e6fa4ca67652c7c3397f5a21bb3cf97d3fee92f2b149
+SHA512 (calendar-1.37-20200430cvs.tar.gz) = 3589eb08fb07aa56eb68d3b4f30b89c1edaf058ffd05c1310d676428ebf40788f1a64f8e9d7a05bc5c44200bd24a7e07c73c466bd62bfaa68b42ef8fb8e47a12