diff --git a/.gitignore b/.gitignore index 469c469..f103589 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,3 @@ 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 -/calendar-1.37-20240528cvs.tar.gz -/calendar-1.37-20250303cvs.tar.gz diff --git a/calendar.spec b/calendar.spec index 21bcc2e..e472fc4 100644 --- a/calendar.spec +++ b/calendar.spec @@ -1,9 +1,9 @@ -%define alphatag 20250303cvs +%define alphatag 20221115cvs Summary: Reminder utility Name: calendar Version: 1.37 -Release: 12.%{alphatag}%{?dist} +Release: 3.%{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,7 +30,8 @@ tomorrow's. The output of the command shows upcoming events for the week. %prep -%autosetup -n %{name}-%{version}-%{alphatag} +%setup -q -n %{name}-%{version}-%{alphatag} +%patch0 -p1 -b .orig cp %{SOURCE1} Makefile for c in calendars/*.*/* ; do @@ -42,10 +43,10 @@ for c in calendars/*.*/* ; do done %build -%make_build +make %{?_smp_mflags} %install -%make_install +make install DESTDIR=%{buildroot} %files %attr(755,root,root) %{_bindir}/calendar @@ -53,34 +54,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 diff --git a/export-calendar-source.sh b/export-calendar-source.sh index 5f51484..e6e6897 100755 --- a/export-calendar-source.sh +++ b/export-calendar-source.sh @@ -1,33 +1,19 @@ #!/bin/sh #TAG=HEAD -TAG=OPENBSD_7_6 -SERVER=anoncvs4.usa.openbsd.org +TAG=OPENBSD_7_2 -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 :ext:anoncvs@${SERVER}:/cvs co -d calendar -r ${TAG} src/usr.bin/calendar - +cvs -d anoncvs@anoncvs.usa.openbsd.org:/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 8d59208..e5e3b69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calendar-1.37-20250303cvs.tar.gz) = e5f15b6c4efc11ee6c7041535ba5e8f2d0cc3ed22a3944bf2f499fabcfae9ae45290b59a564641bf0355fa402674890694054790a9ee64304a8214752b6b4edf +SHA512 (calendar-1.37-20221115cvs.tar.gz) = a8f8df6d28395e0d4e7e773a85d1ca08008be9969bd95a2be253a5dc22619c1ad5c15e7a9fe841b8f49da27ecd97c1c395ae753503c18ad419ebd78f7eac9d4d