1# ncurses 6.1 - patch 20191123 - Thomas E. Dickey 2# 3# ------------------------------------------------------------------------------ 4# 5# Ncurses 6.1 is at 6# ftp.gnu.org:/pub/gnu 7# 8# Patches for ncurses 6.1 can be found at 9# ftp://ftp.invisible-island.net/ncurses/6.1 10# http://invisible-mirror.net/archives/ncurses/6.1 11# 12# ------------------------------------------------------------------------------ 13# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191123.patch.gz 14# patch by Thomas E. Dickey <dickey@invisible-island.net> 15# created Sun Nov 24 02:39:05 UTC 2019 16# ------------------------------------------------------------------------------ 17# Ada95/package/AdaCurses-doc.spec | 12 ++++++++++-- 18# Ada95/package/AdaCurses.spec | 12 ++++++++++-- 19# NEWS | 6 +++++- 20# VERSION | 2 +- 21# dist.mk | 4 ++-- 22# package/debian-mingw/changelog | 4 ++-- 23# package/debian-mingw64/changelog | 4 ++-- 24# package/debian/changelog | 4 ++-- 25# package/mingw-ncurses.nsi | 4 ++-- 26# package/mingw-ncurses.spec | 6 +++--- 27# package/ncurses.spec | 12 ++++++++++-- 28# package/ncursest.spec | 12 ++++++++++-- 29# test/package/mingw-ncurses-examples.spec | 12 ++++++++++-- 30# test/package/ncurses-examples.spec | 12 ++++++++++-- 31# 14 files changed, 79 insertions(+), 27 deletions(-) 32# ------------------------------------------------------------------------------ 33Index: Ada95/package/AdaCurses-doc.spec 34Prereq: 1.6 35--- ncurses-6.1-20191116+/Ada95/package/AdaCurses-doc.spec 2019-09-07 20:37:52.000000000 +0000 36+++ ncurses-6.1-20191123/Ada95/package/AdaCurses-doc.spec 2019-11-23 21:15:53.000000000 +0000 37@@ -3,7 +3,7 @@ 38 %define AppVersion MAJOR.MINOR 39 %define AppRelease YYYYMMDD 40 %define AppPackage %{AppProgram}-doc 41-# $Id: AdaCurses-doc.spec,v 1.6 2019/09/07 20:37:52 tom Exp $ 42+# $Id: AdaCurses-doc.spec,v 1.7 2019/11/23 21:15:53 tom Exp $ 43 Name: %{AppPackage} 44 Version: %{AppVersion} 45 Release: %{AppRelease} 46@@ -37,7 +37,12 @@ 47 (cd doc && make install.html DESTDIR=$RPM_BUILD_ROOT ) 48 49 %clean 50-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 51+if rm -rf $RPM_BUILD_ROOT; then 52+ echo OK 53+else 54+ find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 55+fi 56+exit 0 57 58 %files 59 %defattr(-,root,root) 60@@ -46,6 +51,9 @@ 61 %changelog 62 # each patch should add its ChangeLog entries here 63 64+* Sat Nov 16 2019 Thomas Dickey 65+- modify clean-rule to work around Fedora NFS bugs. 66+ 67 * Sat Sep 07 2019 Thomas Dickey 68 - use AppProgram to replace "AdaCurses" globally 69 70Index: Ada95/package/AdaCurses.spec 71Prereq: 1.24 72--- ncurses-6.1-20191116+/Ada95/package/AdaCurses.spec 2019-09-15 00:07:32.000000000 +0000 73+++ ncurses-6.1-20191123/Ada95/package/AdaCurses.spec 2019-11-23 21:15:31.000000000 +0000 74@@ -2,7 +2,7 @@ 75 %define AppProgram AdaCurses 76 %define AppVersion MAJOR.MINOR 77 %define AppRelease YYYYMMDD 78-# $Id: AdaCurses.spec,v 1.24 2019/09/15 00:07:32 tom Exp $ 79+# $Id: AdaCurses.spec,v 1.25 2019/11/23 21:15:31 tom Exp $ 80 Name: %{AppProgram} 81 Version: %{AppVersion} 82 Release: %{AppRelease} 83@@ -65,7 +65,12 @@ 84 ) 85 86 %clean 87-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 88+if rm -rf $RPM_BUILD_ROOT; then 89+ echo OK 90+else 91+ find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 92+fi 93+exit 0 94 95 %files 96 %defattr(-,root,root) 97@@ -82,6 +87,9 @@ 98 %changelog 99 # each patch should add its ChangeLog entries here 100 101+* Sat Nov 16 2019 Thomas Dickey 102+- modify clean-rule to work around Fedora NFS bugs. 103+ 104 * Sat Sep 14 2019 Thomas Dickey 105 - build-fixes for Fedora29, OpenSUSE 106 107Index: NEWS 108Prereq: 1.3407 109--- ncurses-6.1-20191116+/NEWS 2019-11-16 20:48:27.000000000 +0000 110+++ ncurses-6.1-20191123/NEWS 2019-11-24 01:55:57.000000000 +0000 111@@ -25,7 +25,7 @@ 112 -- sale, use or other dealings in this Software without prior written -- 113 -- authorization. -- 114 ------------------------------------------------------------------------------- 115--- $Id: NEWS,v 1.3407 2019/11/16 20:48:27 tom Exp $ 116+-- $Id: NEWS,v 1.3410 2019/11/24 01:55:57 tom Exp $ 117 ------------------------------------------------------------------------------- 118 119 This is a log of changes that ncurses has gone through since Zeyd started 120@@ -45,6 +45,10 @@ 121 Changes through 1.9.9e did not credit all contributions; 122 it is not possible to add this information. 123 124+20191123 125+ + fix typo for MinGW rpm test-package. 126+ + workaround in rpm specs for NFS problems in Fedora 31. 127+ 128 20191116 129 + modify ncurses/Makefile.in to fix a case where Debian/testing changes 130 to the ld --as-needed configuration broke ncurses-examples test 131Index: VERSION 132--- ncurses-6.1-20191116+/VERSION 2019-11-16 15:09:15.000000000 +0000 133+++ ncurses-6.1-20191123/VERSION 2019-11-23 15:45:17.000000000 +0000 134@@ -1 +1 @@ 135-5:0:10 6.1 20191116 136+5:0:10 6.1 20191123 137Index: dist.mk 138Prereq: 1.1315 139--- ncurses-6.1-20191116+/dist.mk 2019-11-16 15:09:15.000000000 +0000 140+++ ncurses-6.1-20191123/dist.mk 2019-11-23 15:45:17.000000000 +0000 141@@ -25,7 +25,7 @@ 142 # use or other dealings in this Software without prior written # 143 # authorization. # 144 ############################################################################## 145-# $Id: dist.mk,v 1.1315 2019/11/16 15:09:15 tom Exp $ 146+# $Id: dist.mk,v 1.1316 2019/11/23 15:45:17 tom Exp $ 147 # Makefile for creating ncurses distributions. 148 # 149 # This only needs to be used directly as a makefile by developers, but 150@@ -37,7 +37,7 @@ 151 # These define the major/minor/patch versions of ncurses. 152 NCURSES_MAJOR = 6 153 NCURSES_MINOR = 1 154-NCURSES_PATCH = 20191116 155+NCURSES_PATCH = 20191123 156 157 # We don't append the patch to the version, since this only applies to releases 158 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) 159Index: package/debian-mingw/changelog 160--- ncurses-6.1-20191116+/package/debian-mingw/changelog 2019-11-16 15:09:15.000000000 +0000 161+++ ncurses-6.1-20191123/package/debian-mingw/changelog 2019-11-23 15:45:17.000000000 +0000 162@@ -1,8 +1,8 @@ 163-ncurses6 (6.1+20191116) unstable; urgency=low 164+ncurses6 (6.1+20191123) unstable; urgency=low 165 166 * latest weekly patch 167 168- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Nov 2019 10:09:15 -0500 169+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Nov 2019 10:45:17 -0500 170 171 ncurses6 (5.9-20131005) unstable; urgency=low 172 173Index: package/debian-mingw64/changelog 174--- ncurses-6.1-20191116+/package/debian-mingw64/changelog 2019-11-16 15:09:15.000000000 +0000 175+++ ncurses-6.1-20191123/package/debian-mingw64/changelog 2019-11-23 15:45:17.000000000 +0000 176@@ -1,8 +1,8 @@ 177-ncurses6 (6.1+20191116) unstable; urgency=low 178+ncurses6 (6.1+20191123) unstable; urgency=low 179 180 * latest weekly patch 181 182- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Nov 2019 10:09:15 -0500 183+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Nov 2019 10:45:17 -0500 184 185 ncurses6 (5.9-20131005) unstable; urgency=low 186 187Index: package/debian/changelog 188--- ncurses-6.1-20191116+/package/debian/changelog 2019-11-16 15:09:15.000000000 +0000 189+++ ncurses-6.1-20191123/package/debian/changelog 2019-11-23 15:45:17.000000000 +0000 190@@ -1,8 +1,8 @@ 191-ncurses6 (6.1+20191116) unstable; urgency=low 192+ncurses6 (6.1+20191123) unstable; urgency=low 193 194 * latest weekly patch 195 196- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Nov 2019 10:09:15 -0500 197+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 23 Nov 2019 10:45:17 -0500 198 199 ncurses6 (5.9-20120608) unstable; urgency=low 200 201Index: package/mingw-ncurses.nsi 202Prereq: 1.361 203--- ncurses-6.1-20191116+/package/mingw-ncurses.nsi 2019-11-16 15:09:15.000000000 +0000 204+++ ncurses-6.1-20191123/package/mingw-ncurses.nsi 2019-11-23 15:45:17.000000000 +0000 205@@ -1,4 +1,4 @@ 206-; $Id: mingw-ncurses.nsi,v 1.361 2019/11/16 15:09:15 tom Exp $ 207+; $Id: mingw-ncurses.nsi,v 1.362 2019/11/23 15:45:17 tom Exp $ 208 209 ; TODO add examples 210 ; TODO bump ABI to 6 211@@ -10,7 +10,7 @@ 212 !define VERSION_MAJOR "6" 213 !define VERSION_MINOR "1" 214 !define VERSION_YYYY "2019" 215-!define VERSION_MMDD "1116" 216+!define VERSION_MMDD "1123" 217 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} 218 219 !define MY_ABI "5" 220Index: package/mingw-ncurses.spec 221--- ncurses-6.1-20191116+/package/mingw-ncurses.spec 2019-11-16 15:09:15.000000000 +0000 222+++ ncurses-6.1-20191123/package/mingw-ncurses.spec 2019-11-24 01:54:24.000000000 +0000 223@@ -3,7 +3,7 @@ 224 Summary: shared libraries for terminal handling 225 Name: mingw32-ncurses6 226 Version: 6.1 227-Release: 20191116 228+Release: 20191123 229 License: X11 230 Group: Development/Libraries 231 Source: ncurses-%{version}-%{release}.tgz 232@@ -68,8 +68,8 @@ 233 --with-cxx-shared \\\ 234 --with-develop \\\ 235 --with-fallbacks=unknown,xterm \\\ 236- --with-tic-path=/usr/bin/tic${MY_ABI} \\\ 237- --with-infocmp-path=/usr/bin/infocmp${MY_ABI} \\\ 238+ --with-tic-path=/usr/bin/tic%{MY_ABI} \\\ 239+ --with-infocmp-path=/usr/bin/infocmp%{MY_ABI} \\\ 240 --with-install-prefix=$RPM_BUILD_ROOT \\\ 241 --with-pc-suffix=%{MY_ABI} \\\ 242 --with-pcre2 \\\ 243Index: package/ncurses.spec 244--- ncurses-6.1-20191116+/package/ncurses.spec 2019-11-16 15:09:15.000000000 +0000 245+++ ncurses-6.1-20191123/package/ncurses.spec 2019-11-23 21:14:34.000000000 +0000 246@@ -1,7 +1,7 @@ 247 Summary: shared libraries for terminal handling 248 Name: ncurses6 249 Version: 6.1 250-Release: 20191116 251+Release: 20191123 252 License: X11 253 Group: Development/Libraries 254 Source: ncurses-%{version}-%{release}.tgz 255@@ -114,7 +114,12 @@ 256 ( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses%{MY_ABI} ) 257 258 %clean 259-rm -rf $RPM_BUILD_ROOT 260+if rm -rf $RPM_BUILD_ROOT; then 261+ echo OK 262+else 263+ find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 264+fi 265+exit 0 266 267 %files 268 %defattr(-,root,root,-) 269@@ -124,6 +129,9 @@ 270 271 %changelog 272 273+* Sat Nov 16 2019 Thomas Dickey 274+- modify clean-rule to work around Fedora NFS bugs. 275+ 276 * Sat Aug 25 2018 Thomas E. Dickey 277 - split spec-file into ncurses6 and ncursest6 to work around toolset breakage 278 in Fedora 28 279Index: package/ncursest.spec 280--- ncurses-6.1-20191116+/package/ncursest.spec 2019-11-16 15:09:15.000000000 +0000 281+++ ncurses-6.1-20191123/package/ncursest.spec 2019-11-23 21:14:52.000000000 +0000 282@@ -1,7 +1,7 @@ 283 Summary: Curses library with POSIX thread support. 284 Name: ncursest6 285 Version: 6.1 286-Release: 20191116 287+Release: 20191123 288 License: X11 289 Group: Development/Libraries 290 Source: ncurses-%{version}-%{release}.tgz 291@@ -118,7 +118,12 @@ 292 ( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncursest%{MY_ABI} ) 293 294 %clean 295-rm -rf $RPM_BUILD_ROOT 296+if rm -rf $RPM_BUILD_ROOT; then 297+ echo OK 298+else 299+ find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 300+fi 301+exit 0 302 303 %files 304 %defattr(-,root,root,-) 305@@ -128,6 +133,9 @@ 306 307 %changelog 308 309+* Sat Nov 16 2019 Thomas Dickey 310+- modify clean-rule to work around Fedora NFS bugs. 311+ 312 * Sat Aug 25 2018 Thomas E. Dickey 313 - split spec-file into ncurses6 and ncursest6 to work around toolset breakage 314 in Fedora 28 315Index: test/package/mingw-ncurses-examples.spec 316Prereq: 1.8 317--- ncurses-6.1-20191116+/test/package/mingw-ncurses-examples.spec 2019-01-27 00:22:16.000000000 +0000 318+++ ncurses-6.1-20191123/test/package/mingw-ncurses-examples.spec 2019-11-23 21:13:52.000000000 +0000 319@@ -4,7 +4,7 @@ 320 %global AppProgram ncurses-examples 321 %global AppVersion MAJOR.MINOR 322 %global AppRelease YYYYMMDD 323-# $Id: mingw-ncurses-examples.spec,v 1.8 2019/01/27 00:22:16 tom Exp $ 324+# $Id: mingw-ncurses-examples.spec,v 1.9 2019/11/23 21:13:52 tom Exp $ 325 Name: mingw32-ncurses6-examples 326 Version: %{AppVersion} 327 Release: %{AppRelease} 328@@ -97,7 +97,12 @@ 329 popd 330 331 %clean 332-rm -rf $RPM_BUILD_ROOT 333+if rm -rf $RPM_BUILD_ROOT; then 334+ echo OK 335+else 336+ find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 337+fi 338+exit 0 339 340 %defattr(-,root,root,-) 341 342@@ -111,5 +116,8 @@ 343 344 %changelog 345 346+* Sat Nov 16 2019 Thomas Dickey 347+- modify clean-rule to work around Fedora NFS bugs. 348+ 349 * Sat Oct 19 2013 Thomas E. Dickey 350 - initial version 351Index: test/package/ncurses-examples.spec 352Prereq: 1.14 353--- ncurses-6.1-20191116+/test/package/ncurses-examples.spec 2019-02-03 01:17:27.000000000 +0000 354+++ ncurses-6.1-20191123/test/package/ncurses-examples.spec 2019-11-23 21:11:34.000000000 +0000 355@@ -3,7 +3,7 @@ 356 %global AltProgram ncursest-examples 357 %global AppVersion MAJOR.MINOR 358 %global AppRelease YYYYMMDD 359-# $Id: ncurses-examples.spec,v 1.14 2019/02/03 01:17:27 tom Exp $ 360+# $Id: ncurses-examples.spec,v 1.16 2019/11/23 21:11:34 tom Exp $ 361 Name: %{AppProgram} 362 Version: %{AppVersion} 363 Release: %{AppRelease} 364@@ -86,7 +86,12 @@ 365 popd 366 367 %clean 368-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 369+if rm -rf $RPM_BUILD_ROOT; then 370+ echo OK 371+else 372+ find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 373+fi 374+exit 0 375 376 %files -n %{AppProgram} 377 %defattr(-,root,root) 378@@ -101,6 +106,9 @@ 379 %changelog 380 # each patch should add its ChangeLog entries here 381 382+* Sat Nov 16 2019 Thomas Dickey 383+- modify clean-rule to work around Fedora NFS bugs. 384+ 385 * Sat Nov 11 2017 Thomas Dickey 386 - add example data-files 387 - use rpm built-in "configure" 388