From 96b95844cc685b11ed0cc215137e394da4505d41 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Feb 07 2020 12:16:54 +0000 Subject: Fix failing build (#1800187) --- diff --git a/tcsh-6.22.02-avoid-gcc-to-fail.patch b/tcsh-6.22.02-avoid-gcc-to-fail.patch new file mode 100644 index 0000000..826ed41 --- /dev/null +++ b/tcsh-6.22.02-avoid-gcc-to-fail.patch @@ -0,0 +1,12 @@ +diff --git a/tc.sig.c b/tc.sig.c +index 77659ca..576605a 100644 +--- a/tc.sig.c ++++ b/tc.sig.c +@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */ + int phup_disabled; /* = 0; */ + int pchild_disabled; /* = 0; */ + int pintr_disabled; /* = 0; */ +-int handle_interrupt; /* = 0; */ + + int + handle_pending_signals(void) diff --git a/tcsh.spec b/tcsh.spec index c2331cc..280c3b5 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -13,7 +13,7 @@ Name: tcsh Summary: An enhanced version of csh, the C shell Version: 6.22.02 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD URL: http://www.tcsh.org/ @@ -42,6 +42,8 @@ BuildRequires: ncurses-devel # Upstream patches -- official upstream patches released by upstream since the # ---------------- last rebase that are necessary for any reason: +Patch001: tcsh-6.22.02-avoid-gcc-to-fail.patch + # Downstream patches -- these should be always included when doing rebase: # ------------------ @@ -175,6 +177,9 @@ fi # ============================================================================= %changelog +* Fri Feb 07 2020 Jan Macku - 6.22.02-3 +- Avoid gcc 10 to fail during build on "multiple definition of handle_interrupt" + * Fri Jan 31 2020 Fedora Release Engineering - 6.22.02-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild