diff --git a/ncurses-6.3-patches.tar.bz2 b/ncurses-6.3-patches.tar.bz2 index 7063efc..97157fd 100644 --- a/ncurses-6.3-patches.tar.bz2 +++ b/ncurses-6.3-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd51269ae94fee72e4e0fad9374e9eede33eba91327ec8e4fdd0ec38bb36a846 -size 286361 +oid sha256:35b3834decf8729922ab068e11a192f83e800282afbb14926135237aeed340f7 +size 481847 diff --git a/ncurses-6.3.dif b/ncurses-6.3.dif index 3cb3a2b..dfca321 100644 --- a/ncurses-6.3.dif +++ b/ncurses-6.3.dif @@ -28,7 +28,7 @@ #include #if defined(__cplusplus) -@@ -5835,12 +5835,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -5965,9 +5968,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man < + +- Add ncurses patch 20220101 + + add section on releasing memory to curs_termcap.3x and + curs_terminfo.3x manpages. +- Add ncurses patch 20211225 + + improve markup, e.g., for external manpage links in the manpages + (prompted by report by Helge Kreutzmann). +- Add ncurses patch 20211219 + + install ncurses-examples programs in libexecdir, adding a wrapper + script to invoke those. + + add help-screen and screen-dump to test/combine.c +- Rename package ncurses-tests to ncurses-examples as upstream does + +------------------------------------------------------------------- +Tue Dec 14 08:19:44 UTC 2021 - Dr. Werner Fink + +- Add ncurses patch 20211211 + + add test/combine.c, to demo/test combining characters. + +------------------------------------------------------------------- +Mon Dec 6 13:54:34 UTC 2021 - Dr. Werner Fink + +- Add ncurses patch 20211204 + + improve configure check for getttynam (report by Werner Fink). +- Correct offsets of patch ncurses-6.3.dif + ------------------------------------------------------------------- Mon Nov 29 13:18:21 UTC 2021 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index ab90207..0d065d0 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,7 +1,7 @@ # # spec file for package ncurses # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -124,13 +124,15 @@ tset -- terminal-initialization utility reset -- terminal initialization utility -%package -n ncurses-tests +%package -n ncurses-examples +Provides: ncurses-tests = 6.3.20211127 +Obsoletes: ncurses-tests <= 6.3.20211127 Summary: Tools using the new curses libraries License: MIT Group: System/Base Requires: ncurses-utils >= %{version} -%description -n ncurses-tests +%description -n ncurses-examples The ncurses based test programs, that is a set of tools showing the features of the new curses libraries. @@ -686,7 +688,7 @@ mv tack-* tack CFLAGS="$CFLAGS -I%{root}%{_incdir}/ncursesw/ -I%{root}%{_incdir}/" \ LDFLAGS="$LDFLAGS -Wl,-rpath-link=%{root}%{_libdir} -L%{root}%{_libdir}" \ LIBS="$LDFLAGS" \ - ./configure --with-ncursesw --with-screen=ncursesw --enable-widec --enable-wattr-macros --prefix=%{_prefix} --bindir=%{_libexecdir}/ncurses --datadir=%{_datadir}/ncurses + ./configure --with-ncursesw --with-screen=ncursesw --enable-widec --enable-wattr-macros --prefix=%{_prefix} --datadir=%{_datadir}/ncurses LD_LIBRARY_PATH=%{root}%{_libdir} \ %if %{with usepcre2} @@ -833,7 +835,7 @@ includedir5=%{_incdir}/ncurses5' "$pc" CFLAGS="$CFLAGS -I%{root}%{_incdir}ncurses/ -I%{root}%{_incdir}/" \ LDFLAGS="$LDFLAGS -Wl,-rpath-link=%{root}%{_libdir} -L%{root}%{_libdir}" \ LIBS="$LDFLAGS" \ - ./configure --with-ncurses --with-screen=ncurses --disable-widec --disable-wattr-macros --prefix=%{_prefix} --bindir=%{_libexecdir}/ncurses --datadir=%{_datadir}/ncurses + ./configure --with-ncurses --with-screen=ncurses --disable-widec --disable-wattr-macros --prefix=%{_prefix} --datadir=%{_datadir}/ncurses LD_LIBRARY_PATH=%{root}%{_libdir} \ %if %{with usepcre2} make %{?_smp_mflags} TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8' @@ -1148,7 +1150,7 @@ pushd test mkdir -p ./%{_mandir}/man6 cp -p $(find -name '*.6') .%{_mandir}/man6/ (cd usr/; tar -cpSf - .) | tar -xpsSf - -C %{buildroot}%{_prefix} - install -m 0755 %{S:8} %{buildroot}%{_libexecdir}/ncurses/ + install -m 0755 %{S:8} %{buildroot}%{_libexecdir}/ncurses-examples/ popd %if 0%{?_crossbuild} @@ -1167,20 +1169,7 @@ pushd test expect -d <<-'EOF' set env(TERM) xterm set timeout 20 - spawn -noecho ".%{_libexecdir}/ncurses/newdemo" - send -- "x" - sleep 5 - send -- "x" - sleep 5 - send -- "x" - sleep 5 - send -- "q" - wait -nowait - EOF - expect -d <<-'EOF' - set env(TERM) xterm - set timeout 20 - spawn -noecho ".%{_libexecdir}/ncurses/newdemo" + spawn -noecho ".%{_libexecdir}/ncurses-examples/newdemo" send -- "x" sleep 5 send -- "x" @@ -1238,10 +1227,11 @@ popd %doc %{_mandir}/man5/*%{ext_man} %doc AUTHORS -%files -n ncurses-tests +%files -n ncurses-examples %defattr(-,root,root) -%dir %{_libexecdir}/ncurses/ -%{_libexecdir}/ncurses/* +%{_bindir}/ncurses-examples +%dir %{_libexecdir}/ncurses-examples/ +%{_libexecdir}/ncurses-examples/* %dir %{_datadir}/ncurses/ %{_datadir}/ncurses/* %doc %{_mandir}/man6/*%{ext_man}