diff --git a/.gitignore b/.gitignore index 0ead00e..55156e2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ calendar-1.26-20110531cvs.tar.gz /calendar-1.28-20140613cvs.tar.gz /calendar-1.35-20180719cvs.tar.gz /calendar-1.35-20190227cvs.tar.gz +/calendar-1.37-20190827cvs.tar.gz diff --git a/Makefile.linux b/Makefile.linux index 4a076fa..92854ef 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -8,7 +8,7 @@ CFLAGS = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -DTM_YEAR_BASE=1900 SRCS = calendar.c io.c day.c pesach.c ostern.c paskha.c OBJS = $(SRCS:.c=.o) -INTER = de_DE.ISO_8859-1 hr_HR.ISO_8859-2 ru_RU.KOI8-R fr_FR.ISO8859-1 +INTER = de_DE.UTF-8 hr_HR.UTF-8 ru_RU.UTF-8 fr_FR.UTF-8 all: calendar diff --git a/calendar.spec b/calendar.spec index 2b9907e..60537dc 100644 --- a/calendar.spec +++ b/calendar.spec @@ -1,9 +1,9 @@ -%define alphatag 20190227cvs +%define alphatag 20190827cvs Summary: Reminder utility Name: calendar -Version: 1.35 -Release: 4.%{alphatag}%{?dist} +Version: 1.37 +Release: 1.%{alphatag}%{?dist} License: BSD URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar @@ -53,12 +53,13 @@ make install DESTDIR=%{buildroot} %{_datadir}/calendar %changelog +* Tue Aug 27 2019 David Cantrell - 1.37-1.20190827cvs +- Upgrade to calendar(1) from OpenBSD 6.5 +- Correct translation filenames in Makefile.linux + * Wed Jul 24 2019 Fedora Release Engineering - 1.35-4.20190227cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Wed Jul 17 2019 Dominique Corbex - 1.35-2.20190227cvs -- Fix output in de_DE, fr_FR, hr_HR, ru_RU locales - * Thu Mar 07 2019 Igor Gnatenko - 1.35-2.20190227cvs - Fix downgradepath diff --git a/export-calendar-source.sh b/export-calendar-source.sh index d1c6b5f..2d8c762 100755 --- a/export-calendar-source.sh +++ b/export-calendar-source.sh @@ -1,7 +1,7 @@ #!/bin/sh #TAG=HEAD -TAG=OPENBSD_6_4 +TAG=OPENBSD_6_5 CWD=$(pwd) CVS_RSH=ssh ; export CVS_RSH diff --git a/sources b/sources index 8e4eb29..58f44c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calendar-1.35-20190227cvs.tar.gz) = cc51f558e82094fabe04a785d1ec796204e6c00f015f70cb6b9a248dc8337fb090ba45468ee4cca4303c23ff24c0ff58d0ffe656a871693fec7b9b6f82b09938 +SHA512 (calendar-1.37-20190827cvs.tar.gz) = 34976ba929f36cec606b3f78672f16efd22d5f066e6a03ca38d193ff9404afb5df4eae8c81e528ed8875e6fa4ca67652c7c3397f5a21bb3cf97d3fee92f2b149