From e99dcb9ad21e0da3f8bce0726dd2dcb8df675efd851e7e45c98eb04202d66687 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 2 Dec 2019 09:56:43 +0000 Subject: [PATCH] Drop superfluously history locking patches OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=90 --- tcsh-6.21.00.dif | 2 +- tcsh.changes | 15 +++++++++++++++ tcsh.spec | 14 -------------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/tcsh-6.21.00.dif b/tcsh-6.21.00.dif index c5c4644..9ec8f89 100644 --- a/tcsh-6.21.00.dif +++ b/tcsh-6.21.00.dif @@ -93,7 +93,7 @@ --- sh.c +++ sh.c 2019-05-09 08:41:54.237060106 +0000 -@@ -1347,6 +1347,9 @@ main(int argc, char **argv) +@@ -1346,6 +1346,9 @@ main(int argc, char **argv) setintr = osetintr; parintr = oparintr; } diff --git a/tcsh.changes b/tcsh.changes index 6c3ea16..cdd1546 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Dec 2 09:47:03 UTC 2019 - Dr. Werner Fink + +- Drop patches + * tcsh-6.21.0-history-file-locking.patch + As upstream introduced its own history file locking + * tcsh-6.18.03-history-merge.dif + To respect upstream history merge handling + * tcsh-6.19.00-history-file-locking-order.patch + Not required due dropped tcsh-6.21.0-history-file-locking.patch + * tcsh-6.20.00-avoid-dotlock-for-fcntl.patch + Not required due dropped tcsh-6.21.0-history-file-locking.patch + * tcsh-6.18.01-history-stderror-jmp.patch + Not required due dropped tcsh-6.21.0-history-file-locking.patch + ------------------------------------------------------------------- Mon Dec 2 08:26:48 UTC 2019 - Dr. Werner Fink diff --git a/tcsh.spec b/tcsh.spec index 7018cf1..aa5df52 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -32,15 +32,6 @@ Patch2: tcsh-6.16.00-norm-cmd.dif Patch4: tcsh-6.18.03-colorls.dif Patch5: tcsh-6.17.06-dspmbyte.dif Patch6: tcsh-6.18.03-catalogs.dif -# PATCH-FIX-SUSE add history file locking (bsc#901076) -Patch9: tcsh-6.21.0-history-file-locking.patch -Patch10: tcsh-6.18.03-history-merge.dif -# PATCH-FIX-SUSE fix history file locking: first unlock then close -Patch11: tcsh-6.19.00-history-file-locking-order.patch -# PATCH-FIX-SUSE Aoid dot locking as patch 9 and 11 do the job better -Patch12: tcsh-6.20.00-avoid-dotlock-for-fcntl.patch -# PATCH-FIX-SUSE Restore cleaning routines in case of an error (bsc#1151630) -Patch13: tcsh-6.18.01-history-stderror-jmp.patch BuildRequires: autoconf BuildRequires: fdupes BuildRequires: ncurses-devel @@ -66,11 +57,6 @@ correction, a history mechanism, job control, and a C-like syntax. %patch4 -b .colorls %patch5 -b .dspmbyte %patch6 -b .catalogs -%patch9 -b .histlock -%patch10 -b .histmerg -%patch11 -b .histlckord -%patch12 -p0 -b .nodtlck -%patch13 -p0 -b .histerrjmp %patch0 -b .0 %build