From 657a0071184eb22f5efe96c2034aa6f8a4c8638d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 15:00:18 +0000 Subject: [PATCH 1/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/calendar.spec b/calendar.spec index e472fc4..b9be047 100644 --- a/calendar.spec +++ b/calendar.spec @@ -3,7 +3,7 @@ Summary: Reminder utility Name: calendar Version: 1.37 -Release: 3.%{alphatag}%{?dist} +Release: 4.%{alphatag}%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND ISC URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar @@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot} %{_datadir}/calendar %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.37-4.20221115cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.37-3.20221115cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 03886615a76d71701c096806c8d9cff8a8dd7cd9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 01:09:22 +0000 Subject: [PATCH 2/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/calendar.spec b/calendar.spec index b9be047..da7b2a1 100644 --- a/calendar.spec +++ b/calendar.spec @@ -3,7 +3,7 @@ Summary: Reminder utility Name: calendar Version: 1.37 -Release: 4.%{alphatag}%{?dist} +Release: 5.%{alphatag}%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND ISC URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar @@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot} %{_datadir}/calendar %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 1.37-5.20221115cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.37-4.20221115cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0327816edb5dbad006cf7c069a811e6a4a7c3483 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 9 Feb 2024 11:05:00 -0500 Subject: [PATCH 3/9] Upgrade to calendar(1) from OpenBSD 7.4 Use non-deprecated syntax for the %patch macro Signed-off-by: David Cantrell --- .gitignore | 1 + calendar.spec | 10 +++++++--- export-calendar-source.sh | 2 +- sources | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f103589..7b04320 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ calendar-1.26-20110531cvs.tar.gz /calendar-1.37-20200430cvs.tar.gz /calendar-1.37-20211220cvs.tar.gz /calendar-1.37-20221115cvs.tar.gz +/calendar-1.37-20240209cvs.tar.gz diff --git a/calendar.spec b/calendar.spec index da7b2a1..976ab34 100644 --- a/calendar.spec +++ b/calendar.spec @@ -1,9 +1,9 @@ -%define alphatag 20221115cvs +%define alphatag 20240209cvs Summary: Reminder utility Name: calendar Version: 1.37 -Release: 5.%{alphatag}%{?dist} +Release: 6.%{alphatag}%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND ISC URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar @@ -31,7 +31,7 @@ week. %prep %setup -q -n %{name}-%{version}-%{alphatag} -%patch0 -p1 -b .orig +%patch -P 0 -p1 -b .orig cp %{SOURCE1} Makefile for c in calendars/*.*/* ; do @@ -54,6 +54,10 @@ make install DESTDIR=%{buildroot} %{_datadir}/calendar %changelog +* Fri Feb 09 2024 David Cantrell - 1.37-6.20240209cvs +- Upgrade to calendar(1) from OpenBSD 7.4 +- Use non-deprecated syntax for the %%patch macro + * Tue Jan 23 2024 Fedora Release Engineering - 1.37-5.20221115cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/export-calendar-source.sh b/export-calendar-source.sh index e6e6897..c4bc056 100755 --- a/export-calendar-source.sh +++ b/export-calendar-source.sh @@ -1,7 +1,7 @@ #!/bin/sh #TAG=HEAD -TAG=OPENBSD_7_2 +TAG=OPENBSD_7_4 CWD=$(pwd) CVS_RSH=ssh ; export CVS_RSH diff --git a/sources b/sources index e5e3b69..314c394 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calendar-1.37-20221115cvs.tar.gz) = a8f8df6d28395e0d4e7e773a85d1ca08008be9969bd95a2be253a5dc22619c1ad5c15e7a9fe841b8f49da27ecd97c1c395ae753503c18ad419ebd78f7eac9d4d +SHA512 (calendar-1.37-20240209cvs.tar.gz) = 2e9be9d79b9b05ecc50ebc125ad942ea2fa0a4d850b9ebe585147fc06a1eba93b02636b6e48667f84c6f79178f8078d4c8b2693a739a48009308e41c81d70551 From 1e26f175fb943ad62243152e05177b57abb56374 Mon Sep 17 00:00:00 2001 From: Evan Goode Date: Thu, 28 Mar 2024 16:11:42 +0000 Subject: [PATCH 4/9] Bump release to -7 to stay newer than Fedora 37 package Signed-off-by: Evan Goode --- calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/calendar.spec b/calendar.spec index 976ab34..0799625 100644 --- a/calendar.spec +++ b/calendar.spec @@ -3,7 +3,7 @@ Summary: Reminder utility Name: calendar Version: 1.37 -Release: 6.%{alphatag}%{?dist} +Release: 7.%{alphatag}%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND ISC URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar @@ -54,6 +54,9 @@ make install DESTDIR=%{buildroot} %{_datadir}/calendar %changelog +* Thu Mar 28 2024 Evan Goode - 1.37-7.20240209cvs +- Bump release to stay newer than Fedora 37 package + * Fri Feb 09 2024 David Cantrell - 1.37-6.20240209cvs - Upgrade to calendar(1) from OpenBSD 7.4 - Use non-deprecated syntax for the %%patch macro From 8bacc1c6f0b207a75520eb00ffb8451b174fe6fd Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 28 May 2024 12:25:40 -0400 Subject: [PATCH 5/9] Upgrade to calendar(1) from OpenBSD 7.5 Signed-off-by: David Cantrell --- .gitignore | 1 + calendar.spec | 14 ++++++++------ export-calendar-source.sh | 20 +++++++++++++++++--- sources | 2 +- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 7b04320..7bfbbd3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ calendar-1.26-20110531cvs.tar.gz /calendar-1.37-20211220cvs.tar.gz /calendar-1.37-20221115cvs.tar.gz /calendar-1.37-20240209cvs.tar.gz +/calendar-1.37-20240528cvs.tar.gz diff --git a/calendar.spec b/calendar.spec index 0799625..1e5e976 100644 --- a/calendar.spec +++ b/calendar.spec @@ -1,9 +1,9 @@ -%define alphatag 20240209cvs +%define alphatag 20240528cvs Summary: Reminder utility Name: calendar Version: 1.37 -Release: 7.%{alphatag}%{?dist} +Release: 8.%{alphatag}%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND ISC URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar @@ -30,8 +30,7 @@ tomorrow's. The output of the command shows upcoming events for the week. %prep -%setup -q -n %{name}-%{version}-%{alphatag} -%patch -P 0 -p1 -b .orig +%autosetup -n %{name}-%{version}-%{alphatag} cp %{SOURCE1} Makefile for c in calendars/*.*/* ; do @@ -43,10 +42,10 @@ for c in calendars/*.*/* ; do done %build -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install %files %attr(755,root,root) %{_bindir}/calendar @@ -54,6 +53,9 @@ make install DESTDIR=%{buildroot} %{_datadir}/calendar %changelog +* Tue May 28 2024 David Cantrell - 1.37-8.20240528cvs +- Upgrade to calendar(1) from OpenBSD 7.5 + * Thu Mar 28 2024 Evan Goode - 1.37-7.20240209cvs - Bump release to stay newer than Fedora 37 package diff --git a/export-calendar-source.sh b/export-calendar-source.sh index c4bc056..cd583a2 100755 --- a/export-calendar-source.sh +++ b/export-calendar-source.sh @@ -1,19 +1,33 @@ #!/bin/sh #TAG=HEAD -TAG=OPENBSD_7_4 +TAG=OPENBSD_7_5 +SERVER=anoncvs4.usa.openbsd.org +PATH=/usr/bin CWD=$(pwd) + +if ! grep "${SERVER}" ~/.ssh/config ; then + echo "*** Configuration block for ${SERVER} not found in ~/.ssh/config" >&2 + echo "*** Make sure this block exists in ~/.ssh/config:" >&2 + echo >&2 + echo "Host ${SERVER}" >&2 + echo " Port 2022" >&2 + exit 1 +fi + CVS_RSH=ssh ; export CVS_RSH + rm -rf calendar calendar-${VER} mkdir calendar -cvs -d anoncvs@anoncvs.usa.openbsd.org:/cvs co \ - -d calendar -r ${TAG} src/usr.bin/calendar +cvs -d :ext:anoncvs@${SERVER}:/cvs co -d calendar -r ${TAG} src/usr.bin/calendar + cd calendar VER="$(cvs status calendar.c | grep 'Working revision:' | awk '{ print $3; }')" SNAPSHOT="$(date +%Y%m%d)cvs" cd .. find calendar -type d -name CVS | xargs rm -rf + mv calendar calendar-${VER}-${SNAPSHOT} tar -cvf - calendar-${VER}-${SNAPSHOT} | gzip -9c > calendar-${VER}-${SNAPSHOT}.tar.gz rm -rf calendar-${VER}-${SNAPSHOT} diff --git a/sources b/sources index 314c394..328cc2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calendar-1.37-20240209cvs.tar.gz) = 2e9be9d79b9b05ecc50ebc125ad942ea2fa0a4d850b9ebe585147fc06a1eba93b02636b6e48667f84c6f79178f8078d4c8b2693a739a48009308e41c81d70551 +SHA512 (calendar-1.37-20240528cvs.tar.gz) = a38d0d71c6645bb141291d989dc69b6e74c8d561f760004bb97713a8b6a5c8bb26bf71b040cdf70602a7dcdc2b95b53609a552981c125dc843343feb3cbde34a From df2eae7e4e38dbbad61d5b3c93f28b9977221019 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:54:04 +0000 Subject: [PATCH 6/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/calendar.spec b/calendar.spec index 1e5e976..b2b0acb 100644 --- a/calendar.spec +++ b/calendar.spec @@ -3,7 +3,7 @@ Summary: Reminder utility Name: calendar Version: 1.37 -Release: 8.%{alphatag}%{?dist} +Release: 9.%{alphatag}%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND ISC URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar @@ -53,6 +53,9 @@ done %{_datadir}/calendar %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.37-9.20240528cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue May 28 2024 David Cantrell - 1.37-8.20240528cvs - Upgrade to calendar(1) from OpenBSD 7.5 From 8f27d6726971727c950d61eae5ba998d2994cc21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:14:23 +0000 Subject: [PATCH 7/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/calendar.spec b/calendar.spec index b2b0acb..cca5504 100644 --- a/calendar.spec +++ b/calendar.spec @@ -3,7 +3,7 @@ Summary: Reminder utility Name: calendar Version: 1.37 -Release: 9.%{alphatag}%{?dist} +Release: 10.%{alphatag}%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND ISC URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar @@ -53,6 +53,9 @@ done %{_datadir}/calendar %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.37-10.20240528cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.37-9.20240528cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ccd217463b281324ad1964dc537ea238042840f2 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 3 Mar 2025 10:53:25 -0500 Subject: [PATCH 8/9] Upgrade to calendar(1) from OpenBSD 7.6 Signed-off-by: David Cantrell --- .gitignore | 1 + calendar.spec | 7 +++++-- export-calendar-source.sh | 2 +- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7bfbbd3..469c469 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ calendar-1.26-20110531cvs.tar.gz /calendar-1.37-20221115cvs.tar.gz /calendar-1.37-20240209cvs.tar.gz /calendar-1.37-20240528cvs.tar.gz +/calendar-1.37-20250303cvs.tar.gz diff --git a/calendar.spec b/calendar.spec index cca5504..128a138 100644 --- a/calendar.spec +++ b/calendar.spec @@ -1,9 +1,9 @@ -%define alphatag 20240528cvs +%define alphatag 20250303cvs Summary: Reminder utility Name: calendar Version: 1.37 -Release: 10.%{alphatag}%{?dist} +Release: 11.%{alphatag}%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND ISC URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar @@ -53,6 +53,9 @@ done %{_datadir}/calendar %changelog +* Mon Mar 03 2025 David Cantrell - 1.37-11.20250303cvs +- Upgrade to calendar(1) from OpenBSD 7.6 + * Thu Jan 16 2025 Fedora Release Engineering - 1.37-10.20240528cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/export-calendar-source.sh b/export-calendar-source.sh index cd583a2..5f51484 100755 --- a/export-calendar-source.sh +++ b/export-calendar-source.sh @@ -1,7 +1,7 @@ #!/bin/sh #TAG=HEAD -TAG=OPENBSD_7_5 +TAG=OPENBSD_7_6 SERVER=anoncvs4.usa.openbsd.org PATH=/usr/bin diff --git a/sources b/sources index 328cc2a..8d59208 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calendar-1.37-20240528cvs.tar.gz) = a38d0d71c6645bb141291d989dc69b6e74c8d561f760004bb97713a8b6a5c8bb26bf71b040cdf70602a7dcdc2b95b53609a552981c125dc843343feb3cbde34a +SHA512 (calendar-1.37-20250303cvs.tar.gz) = e5f15b6c4efc11ee6c7041535ba5e8f2d0cc3ed22a3944bf2f499fabcfae9ae45290b59a564641bf0355fa402674890694054790a9ee64304a8214752b6b4edf From a0ce0d4ff51a584dbe40ea6bf8b3147a8d79c79c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:03:46 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- calendar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/calendar.spec b/calendar.spec index 128a138..21bcc2e 100644 --- a/calendar.spec +++ b/calendar.spec @@ -3,7 +3,7 @@ Summary: Reminder utility Name: calendar Version: 1.37 -Release: 11.%{alphatag}%{?dist} +Release: 12.%{alphatag}%{?dist} License: BSD-3-Clause AND BSD-2-Clause AND ISC URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar @@ -53,6 +53,9 @@ done %{_datadir}/calendar %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.37-12.20250303cvs +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Mar 03 2025 David Cantrell - 1.37-11.20250303cvs - Upgrade to calendar(1) from OpenBSD 7.6