rpm/ncurses
SHA256
1
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

Accepting request 460690 from Base:System

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/460690
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=127
This commit is contained in:
Dominique Leuenberger 2017-03-05 16:50:23 +00:00 committed by Git OBS Bridge
commit 2b18fbd616
4 changed files with 123 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ncurses-6.0-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:72dc24460e605ed1ce18410aed542b7e88a3fed63eb08827eb20199f5d718da3 oid sha256:c9e207531c4357cf2d4e44adf8ce6cb93e7af5799174497c7733cfe3bc9d3814
size 1640183 size 1739944

90
ncurses-6.0.dif
View File

@ -21,8 +21,8 @@
19 files changed, 240 insertions(+), 80 deletions(-) 19 files changed, 240 insertions(+), 80 deletions(-)
--- aclocal.m4 --- aclocal.m4
+++ aclocal.m4 2017-01-30 08:55:04.189218562 +0000 +++ aclocal.m4 2017-02-20 11:16:21.482330611 +0000
@@ -564,7 +564,7 @@ AC_MSG_CHECKING([for size of bool]) @@ -593,7 +593,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[ AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out rm -f cf_test.out
AC_TRY_RUN([ AC_TRY_RUN([
@ -31,7 +31,7 @@
#include <stdio.h> #include <stdio.h>
#if defined(__cplusplus) #if defined(__cplusplus)
@@ -4733,12 +4733,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -4766,12 +4766,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source echo '? missing rename for '\$cf_source
cf_target="\$cf_source" cf_target="\$cf_source"
fi fi
@ -49,7 +49,7 @@
sed -f $cf_man_alias \\ sed -f $cf_man_alias \\
CF_EOF CF_EOF
@@ -4748,7 +4751,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -4781,7 +4784,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF CF_EOF
else else
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -58,7 +58,7 @@
CF_EOF CF_EOF
fi fi
@@ -4788,7 +4791,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -4821,7 +4824,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_so_strip \$TMP
fi fi
fi fi
@ -67,7 +67,7 @@
CF_EOF CF_EOF
fi fi
@@ -4797,23 +4800,23 @@ case "$MANPAGE_FORMAT" in @@ -4830,23 +4833,23 @@ case "$MANPAGE_FORMAT" in
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories # BSDI installs only .0 suffixes in the cat directories
@ -97,7 +97,7 @@
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test \$section = 1 ; then if test \$section = 1 ; then
@@ -4822,7 +4825,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -4855,7 +4858,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then if test -f \$cf_alias\${suffix} ; then
@ -106,7 +106,7 @@
then then
continue continue
fi fi
@@ -4832,18 +4835,18 @@ CF_EOF @@ -4865,18 +4868,18 @@ CF_EOF
case "x$LN_S" in case "x$LN_S" in
(*-f) (*-f)
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -128,7 +128,7 @@
echo ".so \$cf_source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then if test -n "$cf_compress" ; then
@@ -4863,9 +4866,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -4896,9 +4899,9 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test \$verb = removing ; then elif test \$verb = removing ; then
@ -141,7 +141,7 @@
) )
test -d \$cf_subdir\${section} && test -d \$cf_subdir\${section} &&
test -n "\$aliases" && ( test -n "\$aliases" && (
@@ -4885,6 +4888,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -4918,6 +4921,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -150,8 +150,8 @@
esac esac
done done
--- configure --- configure
+++ configure 2017-01-30 08:55:04.193218496 +0000 +++ configure 2017-02-20 11:16:21.486330535 +0000
@@ -5896,7 +5896,7 @@ case $cf_cv_system_name in @@ -5904,7 +5904,7 @@ case $cf_cv_system_name in
fi fi
;; ;;
(linux*|gnu*|k*bsd*-gnu|freebsd*) (linux*|gnu*|k*bsd*-gnu|freebsd*)
@ -160,7 +160,7 @@
;; ;;
(openbsd[2-9].*|mirbsd*) (openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath," LD_RPATH_OPT="-Wl,-rpath,"
@@ -11749,12 +11749,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -11770,12 +11770,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source echo '? missing rename for '\$cf_source
cf_target="\$cf_source" cf_target="\$cf_source"
fi fi
@ -178,7 +178,7 @@
sed -f $cf_man_alias \\ sed -f $cf_man_alias \\
CF_EOF CF_EOF
@@ -11764,7 +11767,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -11785,7 +11788,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF CF_EOF
else else
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -187,7 +187,7 @@
CF_EOF CF_EOF
fi fi
@@ -11804,7 +11807,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -11825,7 +11828,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_so_strip \$TMP
fi fi
fi fi
@ -196,7 +196,7 @@
CF_EOF CF_EOF
fi fi
@@ -11813,23 +11816,23 @@ case "$MANPAGE_FORMAT" in @@ -11834,23 +11837,23 @@ case "$MANPAGE_FORMAT" in
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories # BSDI installs only .0 suffixes in the cat directories
@ -226,7 +226,7 @@
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test \$section = 1 ; then if test \$section = 1 ; then
@@ -11838,7 +11841,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -11859,7 +11862,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then if test -f \$cf_alias\${suffix} ; then
@ -235,7 +235,7 @@
then then
continue continue
fi fi
@@ -11848,18 +11851,18 @@ CF_EOF @@ -11869,18 +11872,18 @@ CF_EOF
case "x$LN_S" in case "x$LN_S" in
(*-f) (*-f)
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -257,7 +257,7 @@
echo ".so \$cf_source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then if test -n "$cf_compress" ; then
@@ -11879,9 +11882,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -11900,9 +11903,9 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test \$verb = removing ; then elif test \$verb = removing ; then
@ -270,7 +270,7 @@
) )
test -d \$cf_subdir\${section} && test -d \$cf_subdir\${section} &&
test -n "\$aliases" && ( test -n "\$aliases" && (
@@ -11901,6 +11904,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -11922,6 +11925,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -278,7 +278,7 @@
;; ;;
esac esac
done done
@@ -22415,6 +22419,7 @@ if test "$with_termlib" != no ; then @@ -22509,6 +22513,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}" TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi fi
@ -287,8 +287,8 @@
# the next lines are needed for linking libtic over libncurses # the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME} TINFO_NAME=${LIB_NAME}
--- include/curses.h.in --- include/curses.h.in
+++ include/curses.h.in 2017-01-30 08:55:04.193218496 +0000 +++ include/curses.h.in 2017-02-20 11:16:21.486330535 +0000
@@ -174,6 +174,9 @@ typedef @cf_cv_typeof_chtype@ chtype; @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
typedef @cf_cv_typeof_mmask_t@ mmask_t; typedef @cf_cv_typeof_mmask_t@ mmask_t;
#endif #endif
@ -299,7 +299,7 @@
* We need FILE, etc. Include this before checking any feature symbols. * We need FILE, etc. Include this before checking any feature symbols.
*/ */
--- include/termcap.h.in --- include/termcap.h.in
+++ include/termcap.h.in 2017-01-30 08:55:04.193218496 +0000 +++ include/termcap.h.in 2017-02-20 11:16:21.486330535 +0000
@@ -46,6 +46,8 @@ extern "C" @@ -46,6 +46,8 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -310,8 +310,8 @@
#undef NCURSES_CONST #undef NCURSES_CONST
--- include/tic.h --- include/tic.h
+++ include/tic.h 2017-01-30 08:55:04.193218496 +0000 +++ include/tic.h 2017-02-20 11:16:21.486330535 +0000
@@ -231,12 +231,12 @@ extern NCURSES_EXPORT(const struct alias @@ -233,12 +233,12 @@ extern NCURSES_EXPORT(const struct alias
*/ */
/* out-of-band values for representing absent capabilities */ /* out-of-band values for representing absent capabilities */
@ -327,7 +327,7 @@
#define CANCELLED_STRING (char *)(-1) #define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames --- man/man_db.renames
+++ man/man_db.renames 2017-01-30 08:55:04.193218496 +0000 +++ man/man_db.renames 2017-02-20 11:16:21.486330535 +0000
@@ -167,6 +167,8 @@ tput.1 tput.1 @@ -167,6 +167,8 @@ tput.1 tput.1
tset.1 tset.1 tset.1 tset.1
vprintf.3s vprintf.3 vprintf.3s vprintf.3
@ -338,8 +338,8 @@
# Other: # Other:
tack.1m tack.1 tack.1m tack.1
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2017-01-30 08:55:04.193218496 +0000 +++ man/ncurses.3x 2017-02-20 11:16:21.486330535 +0000
@@ -121,6 +121,10 @@ after the shell environment variable \fB @@ -134,6 +134,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.] [See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes .SS Datatypes
.PP .PP
@ -351,7 +351,7 @@
called \fIwindows\fR, which can be thought of as two-dimensional called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen. arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in --- misc/gen-pkgconfig.in
+++ misc/gen-pkgconfig.in 2017-01-30 08:55:04.193218496 +0000 +++ misc/gen-pkgconfig.in 2017-02-20 11:16:21.486330535 +0000
@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include" @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
fi fi
@ -391,7 +391,7 @@
echo "** creating ${name}${suffix}.pc" echo "** creating ${name}${suffix}.pc"
--- misc/ncurses-config.in --- misc/ncurses-config.in
+++ misc/ncurses-config.in 2017-01-30 08:55:04.193218496 +0000 +++ misc/ncurses-config.in 2017-02-20 11:16:21.490330456 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do @@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link # compile/link
--cflags) --cflags)
@ -402,7 +402,7 @@
fi fi
if test "${includedir}" != /usr/include ; then if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2017-01-30 08:56:23.355917684 +0000 +++ misc/terminfo.src 2017-02-20 11:16:21.542329451 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty, @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
@ -782,7 +782,7 @@
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in --- ncurses/Makefile.in
+++ ncurses/Makefile.in 2017-01-30 08:55:04.197218430 +0000 +++ ncurses/Makefile.in 2017-02-20 11:16:21.494330379 +0000
@@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) : @@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
@ -793,8 +793,8 @@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/curses.priv.h --- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2017-01-30 08:55:04.197218430 +0000 +++ ncurses/curses.priv.h 2017-02-20 11:16:21.494330379 +0000
@@ -2030,6 +2030,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec @@ -2034,6 +2034,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t); extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
extern NCURSES_EXPORT(int) _nc_access (const char *, int); extern NCURSES_EXPORT(int) _nc_access (const char *, int);
@ -804,7 +804,7 @@
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
--- ncurses/run_cmd.sh --- ncurses/run_cmd.sh
+++ ncurses/run_cmd.sh 2017-01-30 08:55:04.197218430 +0000 +++ ncurses/run_cmd.sh 2017-02-20 11:16:21.494330379 +0000
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -818,7 +818,7 @@
+ +
+exec ${1+"$@"} +exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2017-01-30 08:55:04.197218430 +0000 +++ ncurses/tinfo/MKfallback.sh 2017-02-20 11:16:21.494330379 +0000
@@ -68,6 +68,12 @@ else @@ -68,6 +68,12 @@ else
tmp_info= tmp_info=
fi fi
@ -851,7 +851,7 @@
done done
--- ncurses/tinfo/access.c --- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2017-01-30 08:55:04.197218430 +0000 +++ ncurses/tinfo/access.c 2017-02-20 11:16:21.494330379 +0000
@@ -35,6 +35,9 @@ @@ -35,6 +35,9 @@
#include <ctype.h> #include <ctype.h>
@ -894,7 +894,7 @@
_nc_access(const char *path, int mode) _nc_access(const char *path, int mode)
{ {
--- ncurses/tinfo/lib_setup.c --- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2017-01-30 08:55:04.197218430 +0000 +++ ncurses/tinfo/lib_setup.c 2017-02-20 11:16:21.494330379 +0000
@@ -593,6 +593,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) @@ -593,6 +593,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
} else if ((value = tigetnum("U8")) >= 0) { } else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */ result = value; /* use extension feature */
@ -906,8 +906,8 @@
result = 1; /* always broken */ result = 1; /* always broken */
} else if (strstr(env, "screen") != 0 } else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c --- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2017-01-30 08:55:04.197218430 +0000 +++ ncurses/tinfo/read_entry.c 2017-02-20 11:16:21.494330379 +0000
@@ -433,6 +433,7 @@ _nc_read_file_entry(const char *const fi @@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0; FILE *fp = 0;
int code; int code;
@ -915,7 +915,7 @@
if (_nc_access(filename, R_OK) < 0 if (_nc_access(filename, R_OK) < 0
|| (fp = fopen(filename, "rb")) == 0) { || (fp = fopen(filename, "rb")) == 0) {
TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
@@ -453,6 +454,7 @@ _nc_read_file_entry(const char *const fi @@ -451,6 +452,7 @@ _nc_read_file_entry(const char *const fi
} }
fclose(fp); fclose(fp);
} }
@ -924,7 +924,7 @@
return (code); return (code);
} }
--- ncurses/tinfo/read_termcap.c --- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2017-01-30 08:55:04.201218365 +0000 +++ ncurses/tinfo/read_termcap.c 2017-02-20 11:16:21.494330379 +0000
@@ -322,14 +322,18 @@ _nc_getent( @@ -322,14 +322,18 @@ _nc_getent(
*/ */
if (fd >= 0) { if (fd >= 0) {
@ -971,8 +971,8 @@
} }
if (copied != 0) if (copied != 0)
--- test/test.priv.h --- test/test.priv.h
+++ test/test.priv.h 2017-01-30 08:55:04.201218365 +0000 +++ test/test.priv.h 2017-02-20 11:16:21.494330379 +0000
@@ -790,12 +790,12 @@ extern char *strnames[], *strcodes[], *s @@ -786,12 +786,12 @@ extern char *strnames[], *strcodes[], *s
#endif #endif
/* out-of-band values for representing absent capabilities */ /* out-of-band values for representing absent capabilities */

50
ncurses.changes
View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Mon Feb 20 11:15:23 UTC 2017 - werner@suse.de
- Add ncurses patch 20170218
+ fix several formatting issues with manual pages.
+ correct read of terminfo entry in which all strings are absent or
explicitly cancelled. Before this fix, the result was that all were
treated as only absent.
+ modify infocmp to suppress mixture of absent/cancelled capabilities
that would only show as "NULL, NULL", unless the -q option is used,
e.g., to show "-, @" or "@, -".
-------------------------------------------------------------------
Mon Feb 13 09:16:11 UTC 2017 - werner@suse.de
- Add ncurses patch 20170212
+ build-fixes for PGI compilers (report by Adam J. Stewart)
+ accept whitespace in sed expression for generating expanded.c
+ modify configure check that g++ compiler warnings are not used.
+ add configure check for -fPIC option needed for shared libraries.
+ let configure --disable-ext-funcs override the default for the
--enable-sp-funcs option.
+ mark some structs in form/menu/panel libraries as potentially opaque
without modifying API/ABI.
+ add configure option --enable-opaque-curses for ncurses library and
similar options for the other libraries.
-------------------------------------------------------------------
Mon Feb 6 11:08:53 UTC 2017 - werner@suse.de
- Add ncurses patch 20170204
+ trim newlines, tabs and escaped newlines from terminfo "paths" passed
to db-iterator.
+ ignore zero-length files in db-iterator; these are useful for
instance to suppress "$HOME/.terminfo" when not wanted.
+ amended "b64:" encoder to work with the terminfo reader.
+ modify terminfo reader to accept "b64:" format using RFC-3548 in
as well as RFC-4648 url/filename-safe format.
+ modify terminfo reader to accept "hex:" format as generated by
"infocmp -0qQ1" (cf: 20150905).
+ adjust authors comment to reflect drop below 1% for SV.
-------------------------------------------------------------------
Fri Feb 3 14:17:59 UTC 2017 - jengelh@inai.de
- Drop authors block from description and ship AUTHORS intead.
- Replace canned summaries and descriptions by
package-specific ones.
- Replace |xargs rm by simpler -delete. Use modern tar options.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 3 08:00:06 UTC 2017 - werner@suse.de Fri Feb 3 08:00:06 UTC 2017 - werner@suse.de

128
ncurses.spec
View File

@ -49,7 +49,7 @@ Obsoletes: ncurses-64bit
# #
Version: 6.0 Version: 6.0
Release: 0 Release: 0
Summary: New curses Libraries Summary: Terminal control library
License: MIT License: MIT
Group: System/Base Group: System/Base
#Git: http://ncurses.scripts.mit.edu #Git: http://ncurses.scripts.mit.edu
@ -75,18 +75,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
As soon as a text application needs to directly control its output to As soon as a text application needs to directly control its output to
the screen (if it wants to place the cursor at location (x,y) then the screen (if it wants to place the cursor at location (x,y) then
write text), ncurses is used. The panel and the forms libraries are write text), ncurses is used. The panel and the forms libraries are
included in this package. These new libraries support color, special included in this package. The ncurses libraries support color, special
characters, and panels. characters, forms, and panels.
Authors:
--------
Thomas E. Dickey <dickey@invisible-island.net>
Juergen Pfeifer <Juergen.Pfeifer@t-online.de>
Eric S. Raymond <esr@thyrsus.com>
Zeyd M. Ben-Halim <zmbenhal@netcom.com>
Pavel Curtis
%package -n ncurses-utils %package -n ncurses-utils
Summary: Tools using the new curses libraries Summary: Tools using the new curses libraries
@ -109,16 +99,6 @@ tset -- terminal-initialization utility
reset -- terminal initialization utility reset -- terminal initialization utility
Authors:
--------
Thomas E. Dickey <dickey@invisible-island.net>
Eric S. Raymond <esr@thyrsus.com>
Zeyd M. Ben-Halim <zmbenhal@netcom.com>
Juergen Pfeifer <Juergen.Pfeifer@t-online.de>
Pavel Curtis
%package -n terminfo-base %package -n terminfo-base
Summary: A terminal descriptions database Summary: A terminal descriptions database
License: MIT License: MIT
@ -131,15 +111,8 @@ This database is the official successor to the 4.4BSD termcap file and
contains information about any known terminal. The ncurses library contains information about any known terminal. The ncurses library
makes use of this database to use terminals correctly. makes use of this database to use terminals correctly.
Authors:
--------
Thomas E. Dickey <dickey@invisible-island.net>
Eric S. Raymond <esr@thyrsus.com>
%package -n libncurses5 %package -n libncurses5
Summary: The New curses Libraries Summary: Terminal control library
License: MIT License: MIT
Group: System/Libraries Group: System/Libraries
Requires: terminfo-base Requires: terminfo-base
@ -152,21 +125,13 @@ Obsoletes: ncurses-64bit
# #
%description -n libncurses5 %description -n libncurses5
The ncurses library is used by the most curses based terminal The ncurses library is used by many terminal applications for
applications for controling its output and input to the screen. controlling output to the screen and input from the user.
This package contains the library built with the version 5 ABI.
Authors:
--------
Thomas E. Dickey <dickey@invisible-island.net>
Eric S. Raymond <esr@thyrsus.com>
Zeyd M. Ben-Halim <zmbenhal@netcom.com>
Juergen Pfeifer <Juergen.Pfeifer@t-online.de>
Pavel Curtis
%package -n libncurses6 %package -n libncurses6
Summary: The New curses Libraries Summary: Terminal control library
License: MIT License: MIT
Group: System/Libraries Group: System/Libraries
Requires: terminfo-base Requires: terminfo-base
@ -174,18 +139,10 @@ Provides: ncurses = %{version}
Recommends: ncurses-utils = %{version} Recommends: ncurses-utils = %{version}
%description -n libncurses6 %description -n libncurses6
The ncurses library is used by the most curses based terminal The ncurses library is used by many terminal applications for
applications for controling its output and input to the screen. controlling output to the screen and input from the user.
This package contains the library built with the version 6 ABI.
Authors:
--------
Thomas E. Dickey <dickey@invisible-island.net>
Juergen Pfeifer <Juergen.Pfeifer@t-online.de>
Eric S. Raymond <esr@thyrsus.com>
Zeyd M. Ben-Halim <zmbenhal@netcom.com>
Pavel Curtis
%package -n terminfo %package -n terminfo
Summary: A terminal descriptions database Summary: A terminal descriptions database
@ -201,15 +158,8 @@ just use the Linux console, xterm, and VT100, you probably will not
need this database -- a minimal /usr/share/terminfo tree for these need this database -- a minimal /usr/share/terminfo tree for these
terminals is already included in the terminfo-base package. terminals is already included in the terminfo-base package.
Authors:
--------
Eric S. Raymond <esr@thyrsus.com>
Thomas E. Dickey <dickey@invisible-island.net>
%package -n ncurses-devel %package -n ncurses-devel
Summary: Include Files and Libraries mandatory for Development Summary: Development files for the ncurses6 terminal control library
License: MIT License: MIT
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: ncurses6-devel Provides: ncurses6-devel
@ -224,21 +174,11 @@ Obsoletes: ncurses-devel-64bit
# #
%description -n ncurses-devel %description -n ncurses-devel
This package contains all necessary include files and libraries needed This package contains the headers needed to build against
to develop applications that require these. the ncurses library in its ABI version 6 form.
Authors:
--------
Thomas E. Dickey <dickey@invisible-island.net>
Juergen Pfeifer <Juergen.Pfeifer@t-online.de>
Eric S. Raymond <esr@thyrsus.com>
Zeyd M. Ben-Halim <zmbenhal@netcom.com>
Pavel Curtis
%package -n ncurses5-devel %package -n ncurses5-devel
Summary: Include Files and Libraries mandatory for Development Summary: Development files for the ncurses5 terminal control library
License: MIT License: MIT
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: ncurses:%{_incdir}/ncurses5/ncurses.h Provides: ncurses:%{_incdir}/ncurses5/ncurses.h
@ -248,18 +188,8 @@ Requires: ncurses = %{version}-%{release}
Requires: ncurses-devel = %{version}-%{release} Requires: ncurses-devel = %{version}-%{release}
%description -n ncurses5-devel %description -n ncurses5-devel
This package contains all necessary include files and libraries needed This package contains the headers needed to build against
to develop applications that require these. the ncurses library in its ABI version 5 form.
Authors:
--------
Thomas E. Dickey <dickey@invisible-island.net>
Juergen Pfeifer <Juergen.Pfeifer@t-online.de>
Eric S. Raymond <esr@thyrsus.com>
Zeyd M. Ben-Halim <zmbenhal@netcom.com>
Pavel Curtis
%package -n tack %package -n tack
Summary: Terminfo action checker Summary: Terminfo action checker
@ -275,18 +205,11 @@ correctness of an existing entry, and to develop the correct pad
timings needed to ensure that screen updates do not fall behind the timings needed to ensure that screen updates do not fall behind the
incoming data stream. incoming data stream.
Authors:
--------
Daniel Weaver <danw@znyx.com>
Eric S. Raymond <esr@thyrsus.com>
%prep %prep
%setup -q %setup -q
rm -f Ada95/src/terminal_interface-curses.adb rm -f Ada95/src/terminal_interface-curses.adb
rm -f mkinstalldirs rm -f mkinstalldirs
tar xfj %{S:1} tar -xjf %{S:1}
set +x set +x
for patch in patches/ncurses*.patch for patch in patches/ncurses*.patch
do do
@ -294,11 +217,11 @@ do
done done
set -x set -x
rm -rf patches/ rm -rf patches/
find -name '*.orig' | xargs -r rm -f find -name '*.orig' -delete
# replace tack from ncurses tarball with the latest version in # replace tack from ncurses tarball with the latest version in
# separate tarball # separate tarball
rm -fr tack rm -fr tack
tar xfz %{S:5} tar -xzf %{S:5}
mv tack-* tack mv tack-* tack
%patch1 -p0 -b .327x %patch1 -p0 -b .327x
%patch4 -p0 -b .hs %patch4 -p0 -b .hs
@ -554,7 +477,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
# #
# Now rebuild libncurses and do the rest of this job # Now rebuild libncurses and do the rest of this job
# #
find -name fallback.o | xargs -r rm -vf find -name fallback.o -print -delete
cp fallback.c.build ncurses/fallback.c cp fallback.c.build ncurses/fallback.c
make -C c++ etip.h make -C c++ etip.h
make %{?_smp_mflags} make %{?_smp_mflags}
@ -565,7 +488,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
EOF EOF
%endif %endif
# must not use %jobs here (would lead to: ln: ncurses.h already exists) # must not use %jobs here (would lead to: ln: ncurses.h already exists)
find man/ -name '*.[1-8]x.*' | xargs -r rm -vf find man/ -name '*.[1-8]x.*' -print -delete
make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir} make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir}
ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir} ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir}
sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config
@ -606,7 +529,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
sleep 1 sleep 1
kill $pid kill $pid
%if !0%{?_crossbuild} %if !0%{?_crossbuild}
find -name fallback.o | xargs -r rm -vf find -name fallback.o -print -delete
cp fallback.c.build ncurses/fallback.c cp fallback.c.build ncurses/fallback.c
%endif %endif
make -C c++ etip.h make -C c++ etip.h
@ -654,7 +577,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
sleep 1 sleep 1
kill $pid kill $pid
%if !0%{?_crossbuild} %if !0%{?_crossbuild}
find -name fallback.o | xargs -r rm -vf find -name fallback.o -print -delete
cp fallback.c.build ncurses/fallback.c cp fallback.c.build ncurses/fallback.c
%endif %endif
make -C c++ etip.h make -C c++ etip.h
@ -688,7 +611,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
sleep 1 sleep 1
kill $pid kill $pid
%if !0%{?_crossbuild} %if !0%{?_crossbuild}
find -name fallback.o | xargs -r rm -vf find -name fallback.o -print -delete
cp fallback.c.build ncurses/fallback.c cp fallback.c.build ncurses/fallback.c
%endif %endif
make -C c++ etip.h make -C c++ etip.h
@ -927,6 +850,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
%doc %{_mandir}/man1/tput.1.gz %doc %{_mandir}/man1/tput.1.gz
%doc %{_mandir}/man1/tset.1.gz %doc %{_mandir}/man1/tset.1.gz
%doc %{_mandir}/man5/*.gz %doc %{_mandir}/man5/*.gz
%doc AUTHORS
%files -n libncurses5 %files -n libncurses5
%defattr(-,root,root) %defattr(-,root,root)