From 36de1039abd2b2fd16848ab560002476d3901ce056667102af4ead7f29fa33c3 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 1 Sep 2020 07:21:56 +0000 Subject: [PATCH] Update to ncurses-6.2-20200831 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=505 --- awk-scripts.patch | 39 ------------------------------------- ncurses-6.2-patches.tar.bz2 | 4 ++-- ncurses.changes | 8 ++++++++ ncurses.spec | 2 -- 4 files changed, 10 insertions(+), 43 deletions(-) delete mode 100644 awk-scripts.patch diff --git a/awk-scripts.patch b/awk-scripts.patch deleted file mode 100644 index 5acaa0d..0000000 --- a/awk-scripts.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- - mk-1st.awk | 2 +- - mk-2nd.awk | 2 +- - mk-hdr.awk | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - ---- mk-1st.awk -+++ mk-1st.awk 2020-08-31 13:43:20.574386946 +0000 -@@ -262,7 +262,7 @@ function install_dll(directory,filename) - function in_subset(value) { - value = " " value " "; - check = subset; -- sub(" .*$", "", check); -+ sub(" *$", "", check); - gsub("[+]", " ", check); - check = " " check " "; - return index(check,value); ---- mk-2nd.awk -+++ mk-2nd.awk 2020-08-31 13:43:26.250284434 +0000 -@@ -56,7 +56,7 @@ - function in_subset(value) { - value = " " value " "; - check = subset; -- sub(" .*$", "", check); -+ sub(" *$", "", check); - gsub("[+]", " ", check); - check = " " check " "; - return index(check,value); ---- mk-hdr.awk -+++ mk-hdr.awk 2020-08-31 13:43:32.146177950 +0000 -@@ -42,7 +42,7 @@ function basename(path) { - function in_subset(value) { - value = " " value " "; - check = subset; -- sub(" .*$", "", check); -+ sub(" *$", "", check); - gsub("[+]", " ", check); - check = " " check " "; - return index(check,value); diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index 5cc7f94..a8e4767 100644 --- a/ncurses-6.2-patches.tar.bz2 +++ b/ncurses-6.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d18ed32b226a3229686e553ed41f89461aca0a17b6c3d998272a7dab3fc7adca -size 914261 +oid sha256:62c5daebb24d035419498e0bb90008914ba32b3c1c9a6590c7f868a807e10db9 +size 915695 diff --git a/ncurses.changes b/ncurses.changes index ace5bd3..b0d5e69 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Sep 1 07:20:13 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200831 + + build-fix for awk-scripts modified for win32-driver (report by Werner + Fink). +- Drop workaround patch awk-scripts.patch as now upstream fixed + ------------------------------------------------------------------- Mon Aug 31 13:56:18 UTC 2020 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index 18b4539..f53e4eb 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -79,7 +79,6 @@ Source7: baselibs.conf Patch0: ncurses-6.2.dif Patch1: ncurses-5.9-ibm327x.dif Patch2: ncurses-5.7-tack.dif -Patch3: awk-scripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _miscdir %{_datadir}/misc %global _incdir %{_includedir} @@ -316,7 +315,6 @@ tar -xzf %{S:5} mv tack-* tack %patch1 -p0 -b .327x %patch2 -p0 -b .hs -%patch3 -p0 -b .xyz %patch0 -p0 -b .p0 %build