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 47565023abe6ffb60fa14e1f97318d627b58943b..c5b68dd49b9eb86fe84ce881de73e202fe14de7f 100644 (file)
--- 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 d532a1f9198f7227ca8a6c9ea81c0e22ab2314b6..9b39110eb842dea294fc77950a175a55bdaf7b3a 100644 (file)
--- 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 cba4bc872ab6732640fb0238c029f382baccaa78..2a0aace5e0d0eb1ad3ea8a48123a9a4cc7d9dd8d 100644 (file)
--- 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 1296c1fcc43932282e08e5d7638bfc06d5add97d..992d3888bbc1e69643e0f9a6cb8ea9a166c2ade3 100644 (file)
--- 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 4cc2b9df310494e46dec732c5c42125609bc853f..4bdaa479b30504c43dc995a1efa258e2689afe9d 100644 (file)
--- 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 caab034c10e7d6002a555357c6c785e6c9e3f006..7ab23431b2343250316110a08f07a69821d0f316 100644 (file)
--- 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 <dickey@invisible-island.net>  Sat, 16 Nov 2019 10:09:15 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  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 caab034c10e7d6002a555357c6c785e6c9e3f006..7ab23431b2343250316110a08f07a69821d0f316 100644 (file)
--- 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 <dickey@invisible-island.net>  Sat, 16 Nov 2019 10:09:15 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  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 252c8297f1a72c5d72af39bba7857c375938f4a1..b0c5e36d544630e14667b4d30a51ba0193f1a37e 100644 (file)
--- 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 <dickey@invisible-island.net>  Sat, 16 Nov 2019 10:09:15 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  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 bf7ffe7cc3bd726b3a33092a6e12bbbcd1e795b5..dfa956ae1a68cb46d5f15272e053154d7334db3e 100644 (file)
--- 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 $\r
+; $Id: mingw-ncurses.nsi,v 1.362 2019/11/23 15:45:17 tom Exp $\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2019"\r
-!define VERSION_MMDD  "1116"\r
+!define VERSION_MMDD  "1123"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 2a763888741a906e61f75949d2016969e6a024de..37bd094a2baeb49a7e62bca51eee725647fe2da2 100644 (file)
--- 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 3f536bc8ca694116d08fd1f160e0006d6d614a05..48b7177de40f02d16d10c48531dc65c1537ed6a0 100644 (file)
--- 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 791311390c6f9ecacbdaea565d11c9903994f555..1b1ed408245b2855df3d9c98a91b5bdcd496ba6b 100644 (file)
--- 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 981a0de9a40b5541e4a0d8fc42c3a1eee3e3870c..5758c29097a5f24901853a8bd24d47383039dca2 100644 (file)
--- 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 aeaca251297b9ef696d9a2c5486fbd30799a8fa2..d2b5a84e7e8b6d9d36cc1912964f95c384424923 100644 (file)
--- 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"