From: Thomas E. Dickey Date: Sun, 24 Nov 2019 02:39:05 +0000 (+0000) Subject: ncurses 6.1 - patch 20191123 X-Git-Tag: v6.2~9 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=1379ab3f6cc5b92256708ecc4129b57928d62cf4 ncurses 6.1 - patch 20191123 + fix typo for MinGW rpm test-package. + workaround in rpm specs for NFS problems in Fedora 31. --- diff --git a/Ada95/package/AdaCurses-doc.spec b/Ada95/package/AdaCurses-doc.spec index 47565023..c5b68dd4 100644 --- a/Ada95/package/AdaCurses-doc.spec +++ b/Ada95/package/AdaCurses-doc.spec @@ -3,7 +3,7 @@ Summary: AdaCurses - Ada95 binding documentation for ncurses %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD %define AppPackage %{AppProgram}-doc -# $Id: AdaCurses-doc.spec,v 1.6 2019/09/07 20:37:52 tom Exp $ +# $Id: AdaCurses-doc.spec,v 1.7 2019/11/23 21:15:53 tom Exp $ Name: %{AppPackage} Version: %{AppVersion} Release: %{AppRelease} @@ -37,7 +37,12 @@ INSTALL_PROGRAM='${INSTALL}' \ (cd doc && make install.html DESTDIR=$RPM_BUILD_ROOT ) %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +if rm -rf $RPM_BUILD_ROOT; then + echo OK +else + find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 +fi +exit 0 %files %defattr(-,root,root) @@ -46,6 +51,9 @@ INSTALL_PROGRAM='${INSTALL}' \ %changelog # each patch should add its ChangeLog entries here +* Sat Nov 16 2019 Thomas Dickey +- modify clean-rule to work around Fedora NFS bugs. + * Sat Sep 07 2019 Thomas Dickey - use AppProgram to replace "AdaCurses" globally diff --git a/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec index d532a1f9..9b39110e 100644 --- a/Ada95/package/AdaCurses.spec +++ b/Ada95/package/AdaCurses.spec @@ -2,7 +2,7 @@ Summary: Ada95 binding for ncurses %define AppProgram AdaCurses %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD -# $Id: AdaCurses.spec,v 1.24 2019/09/15 00:07:32 tom Exp $ +# $Id: AdaCurses.spec,v 1.25 2019/11/23 21:15:31 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} @@ -65,7 +65,12 @@ make install DESTDIR=$RPM_BUILD_ROOT ) %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +if rm -rf $RPM_BUILD_ROOT; then + echo OK +else + find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 +fi +exit 0 %files %defattr(-,root,root) @@ -82,6 +87,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog # each patch should add its ChangeLog entries here +* Sat Nov 16 2019 Thomas Dickey +- modify clean-rule to work around Fedora NFS bugs. + * Sat Sep 14 2019 Thomas Dickey - build-fixes for Fedora29, OpenSUSE diff --git a/NEWS b/NEWS index cba4bc87..2a0aace5 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3407 2019/11/16 20:48:27 tom Exp $ +-- $Id: NEWS,v 1.3410 2019/11/24 01:55:57 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,10 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20191123 + + fix typo for MinGW rpm test-package. + + workaround in rpm specs for NFS problems in Fedora 31. + 20191116 + modify ncurses/Makefile.in to fix a case where Debian/testing changes to the ld --as-needed configuration broke ncurses-examples test diff --git a/VERSION b/VERSION index 1296c1fc..992d3888 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.1 20191116 +5:0:10 6.1 20191123 diff --git a/dist.mk b/dist.mk index 4cc2b9df..4bdaa479 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1315 2019/11/16 15:09:15 tom Exp $ +# $Id: dist.mk,v 1.1316 2019/11/23 15:45:17 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 1 -NCURSES_PATCH = 20191116 +NCURSES_PATCH = 20191123 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index caab034c..7ab23431 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.1+20191116) unstable; urgency=low +ncurses6 (6.1+20191123) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 16 Nov 2019 10:09:15 -0500 + -- Thomas E. Dickey Sat, 23 Nov 2019 10:45:17 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index caab034c..7ab23431 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.1+20191116) unstable; urgency=low +ncurses6 (6.1+20191123) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 16 Nov 2019 10:09:15 -0500 + -- Thomas E. Dickey Sat, 23 Nov 2019 10:45:17 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 252c8297..b0c5e36d 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.1+20191116) unstable; urgency=low +ncurses6 (6.1+20191123) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 16 Nov 2019 10:09:15 -0500 + -- Thomas E. Dickey Sat, 23 Nov 2019 10:45:17 -0500 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index bf7ffe7c..dfa956ae 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.361 2019/11/16 15:09:15 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.362 2019/11/23 15:45:17 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "1" !define VERSION_YYYY "2019" -!define VERSION_MMDD "1116" +!define VERSION_MMDD "1123" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 2a763888..37bd094a 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 6.1 -Release: 20191116 +Release: 20191123 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz @@ -68,8 +68,8 @@ This package is used for testing ABI %{MY_ABI} with cross-compiles to MinGW. --with-cxx-shared \\\ --with-develop \\\ --with-fallbacks=unknown,xterm \\\ - --with-tic-path=/usr/bin/tic${MY_ABI} \\\ - --with-infocmp-path=/usr/bin/infocmp${MY_ABI} \\\ + --with-tic-path=/usr/bin/tic%{MY_ABI} \\\ + --with-infocmp-path=/usr/bin/infocmp%{MY_ABI} \\\ --with-install-prefix=$RPM_BUILD_ROOT \\\ --with-pc-suffix=%{MY_ABI} \\\ --with-pcre2 \\\ diff --git a/package/ncurses.spec b/package/ncurses.spec index 3f536bc8..48b7177d 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.1 -Release: 20191116 +Release: 20191123 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz @@ -114,7 +114,12 @@ rm -f test/ncurses ( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses%{MY_ABI} ) %clean -rm -rf $RPM_BUILD_ROOT +if rm -rf $RPM_BUILD_ROOT; then + echo OK +else + find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 +fi +exit 0 %files %defattr(-,root,root,-) @@ -124,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 16 2019 Thomas Dickey +- modify clean-rule to work around Fedora NFS bugs. + * Sat Aug 25 2018 Thomas E. Dickey - split spec-file into ncurses6 and ncursest6 to work around toolset breakage in Fedora 28 diff --git a/package/ncursest.spec b/package/ncursest.spec index 79131139..1b1ed408 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.1 -Release: 20191116 +Release: 20191123 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz @@ -118,7 +118,12 @@ rm -f test/ncurses ( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncursest%{MY_ABI} ) %clean -rm -rf $RPM_BUILD_ROOT +if rm -rf $RPM_BUILD_ROOT; then + echo OK +else + find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 +fi +exit 0 %files %defattr(-,root,root,-) @@ -128,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 16 2019 Thomas Dickey +- modify clean-rule to work around Fedora NFS bugs. + * Sat Aug 25 2018 Thomas E. Dickey - split spec-file into ncurses6 and ncursest6 to work around toolset breakage in Fedora 28 diff --git a/test/package/mingw-ncurses-examples.spec b/test/package/mingw-ncurses-examples.spec index 981a0de9..5758c290 100644 --- a/test/package/mingw-ncurses-examples.spec +++ b/test/package/mingw-ncurses-examples.spec @@ -4,7 +4,7 @@ Summary: ncurses-examples - example/test programs from ncurses %global AppProgram ncurses-examples %global AppVersion MAJOR.MINOR %global AppRelease YYYYMMDD -# $Id: mingw-ncurses-examples.spec,v 1.8 2019/01/27 00:22:16 tom Exp $ +# $Id: mingw-ncurses-examples.spec,v 1.9 2019/11/23 21:13:52 tom Exp $ Name: mingw32-ncurses6-examples Version: %{AppVersion} Release: %{AppRelease} @@ -97,7 +97,12 @@ pushd BUILD-W64 popd %clean -rm -rf $RPM_BUILD_ROOT +if rm -rf $RPM_BUILD_ROOT; then + echo OK +else + find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 +fi +exit 0 %defattr(-,root,root,-) @@ -111,5 +116,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 16 2019 Thomas Dickey +- modify clean-rule to work around Fedora NFS bugs. + * Sat Oct 19 2013 Thomas E. Dickey - initial version diff --git a/test/package/ncurses-examples.spec b/test/package/ncurses-examples.spec index aeaca251..d2b5a84e 100644 --- a/test/package/ncurses-examples.spec +++ b/test/package/ncurses-examples.spec @@ -3,7 +3,7 @@ Summary: example/test programs from ncurses %global AltProgram ncursest-examples %global AppVersion MAJOR.MINOR %global AppRelease YYYYMMDD -# $Id: ncurses-examples.spec,v 1.14 2019/02/03 01:17:27 tom Exp $ +# $Id: ncurses-examples.spec,v 1.16 2019/11/23 21:11:34 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} @@ -86,7 +86,12 @@ make install DESTDIR=$RPM_BUILD_ROOT popd %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +if rm -rf $RPM_BUILD_ROOT; then + echo OK +else + find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 +fi +exit 0 %files -n %{AppProgram} %defattr(-,root,root) @@ -101,6 +106,9 @@ popd %changelog # each patch should add its ChangeLog entries here +* Sat Nov 16 2019 Thomas Dickey +- modify clean-rule to work around Fedora NFS bugs. + * Sat Nov 11 2017 Thomas Dickey - add example data-files - use rpm built-in "configure"