From 00c4ba7a51d3e564dfda5fd2c4457a27a44ab2b8 Mon Sep 17 00:00:00 2001 From: Christoph Karl Date: Feb 04 2022 18:56:28 +0000 Subject: Update to upstream 5.10.1 --- diff --git a/.gitignore b/.gitignore index c95a2c9..c0ec2de 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ rcs-5.7.tar.gz /rcs-5.9.3.tar.xz /rcs-5.9.4.tar.xz /rcs-5.10.0.tar.xz +/rcs-5.10.1.tar.lz diff --git a/rcs-5.10.0-SIGSTKSZ.patch b/rcs-5.10.0-SIGSTKSZ.patch deleted file mode 100644 index 5906e3e..0000000 --- a/rcs-5.10.0-SIGSTKSZ.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up rcs-5.10.0.orig/src/b-isr.c rcs-5.10.0/src/b-isr.c ---- rcs-5.10.0.orig/src/b-isr.c 2021-04-04 14:13:59.185941494 +0200 -+++ rcs-5.10.0/src/b-isr.c 2021-04-04 14:15:21.087397267 +0200 -@@ -198,22 +198,16 @@ setup_catchsig (size_t count, int const - #undef MUST - } - --#if defined HAVE_SIGALTSTACK && defined SIGSTKSZ --#define ISR_STACK_SIZE (10 * SIGSTKSZ) --#else --#define ISR_STACK_SIZE 0 --#endif -- - struct isr_scratch * - isr_init (bool *be_quiet) - { - struct isr_scratch *scratch = ZLLOC (1, struct isr_scratch); - --#if ISR_STACK_SIZE -+#if defined HAVE_SIGALTSTACK && defined SIGSTKSZ - stack_t ss = - { -- .ss_sp = alloc (PLEXUS, ISR_STACK_SIZE), -- .ss_size = ISR_STACK_SIZE, -+ .ss_sp = alloc (PLEXUS, (10 * SIGSTKSZ)), -+ .ss_size = (10 * SIGSTKSZ), - .ss_flags = 0 - }; - diff --git a/rcs-5.10.0-upstream-8883c4f5a2.patch b/rcs-5.10.0-upstream-8883c4f5a2.patch deleted file mode 100644 index d1fe359..0000000 --- a/rcs-5.10.0-upstream-8883c4f5a2.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- rcs-5.10.0-my/tests/t632 -+++ rcs-5.10.0/tests/t632 -@@ -40,6 +40,15 @@ echo | co -l -I $w \ - # (This is skipped if GNU coreutils timeout(1) is not available.) - ## - -+# -+# The timeout test needs co(1) to block on input. -+# If stdin is not open and connected to a tty, skip out. -+if test -t 0 ; then -+ echo STDIN OK -+else -+ exit 0 -+fi -+ - # TODO: Don't be lame! Pick one: - # (a) Mimic timeout(1) w/ sh commands. - # (b) Incorporate heart of timeout(1) into ./btdt and use that. diff --git a/rcs-5.8-build-tweaks.patch b/rcs-5.8-build-tweaks.patch deleted file mode 100644 index d2f16bc..0000000 --- a/rcs-5.8-build-tweaks.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up ./man/Makefile.in.build-tweaks ./man/Makefile.in ---- ./man/Makefile.in.build-tweaks 2013-05-06 09:28:45.000000000 +0200 -+++ ./man/Makefile.in 2013-05-10 23:03:36.975917262 +0200 -@@ -1237,9 +1237,9 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - dist_man_MANS = ci.1 co.1 ident.1 merge.1 rcs.1 rcsclean.1 \ -- rcsdiff.1 rcsfile.5 rcsmerge.1 rlog.1 -+ rcsdiff.1 rcsfile.5 rcsmerge.1 rlog.1 rcsfreeze.1 - --dist_noinst_MANS = rcsfreeze.1 -+#dist_noinst_MANS = rcsfreeze.1 - BUILT_SOURCES = REL $(dist_noinst_MANS) - bits = b-base \ - b-emptylogmessage \ diff --git a/rcs.spec b/rcs.spec index cd364cd..4e9f218 100644 --- a/rcs.spec +++ b/rcs.spec @@ -1,14 +1,10 @@ Summary: Revision Control System (RCS) file version management tools Name: rcs -Version: 5.10.0 -Release: 5%{?dist} +Version: 5.10.1 +Release: 1%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/rcs/ -Source: http://ftp.gnu.org/gnu/rcs/%{name}-%{version}.tar.xz - -Patch0: rcs-5.8-build-tweaks.patch -Patch1: rcs-5.10.0-upstream-8883c4f5a2.patch -Patch2: rcs-5.10.0-SIGSTKSZ.patch +Source: http://ftp.gnu.org/gnu/rcs/%{name}-%{version}.tar.lz # for bundled(gnulib) see https://fedorahosted.org/fpc/ticket/174 Provides: bundled(gnulib) @@ -19,6 +15,7 @@ BuildRequires: groff BuildRequires: ghostscript BuildRequires: ed BuildRequires: texinfo +BuildRequires: lzip Requires: diffutils %description @@ -33,9 +30,6 @@ different versions of files. %prep %setup -q -%patch0 -p1 -b .build-tweaks -%patch1 -p1 -b .upstream-8883c4f5a2 -%patch2 -p1 -b .SIGSTKSZ autoconf @@ -60,6 +54,9 @@ make check XFAIL_TESTS="`tests/known-failures %{version}`" %{_infodir}/* %changelog +* Fri Feb 04 2022 Fedora Release Engineering - 5.10.1-1 +- Update to upstream 5.10.1 + * Fri Jan 21 2022 Fedora Release Engineering - 5.10.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 400dd4a..b4316e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rcs-5.10.0.tar.xz) = d42bded1214f27dfcbe912bbabad8479555a02bc57000a62512d63ff0672de1ed23911cd15c9d1aa4b9a53794ac3fd45937fa1cbc0fcb9d54a3ede4d831f76d0 +SHA512 (rcs-5.10.1.tar.lz) = 4d3755d704a05da8582acb78a83845885f34b3144af6d19c568e6707831563b077ec5603a12f5d4de6ec583d0886d3a8ccc7ee0e1f10070f9e6de142198cd530