pool/readline
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 664074 from Base:System

Browse Source 
- Update to readline-8.0 final

- Update to readline-8.0-rc1 for testing 

- Update to readline-8.0-beta2 for testing
  j. Readline now allows application-defined keymap names; there is a new public
     function, rl_set_keymap_name(), to do that.
  k. The "Insert" keypad key, if available, now puts readline into overwrite
     mode.
    readline-5.2-conf.patch
- Port and modify patches
  * readline-6.2-metamode.patch
  * readline-6.3-input.dif
  * readline-7.0-screen.patch
  * readline-8.0.dif

- Update to readline-8.0-beta for testing
  a. Non-incremental vi-mode search (`N', `n') can search for a shell pattern, as
     Posix specifies (uses fnmatch(3) if available).
  b. There are new `next-screen-line' and `previous-screen-line' bindable
     commands, which move the cursor to the same column in the next, or previous,
     physical line, respectively.
  c. There are default key bindings for control-arrow-key key combinations.
  d. A negative argument (-N) to `quoted-insert' means to insert the next N
     characters using quoted-insert.
  e. New public function: rl_check_signals(), which allows applications to
     respond to signals that readline catches while waiting for input using
     a custom read function.
  f. There is new support for conditionally testing the readline version in an
     inputrc file, with a full set of arithmetic comparison operators available.

OBS-URL: https://build.opensuse.org/request/show/664074
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/readline?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2019-01-29 13:37:35 +00:00 committed by Git OBS Bridge
commit e9fe7fc99a
16 changed files with 147 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
baselibs.conf
View File

@ -1,8 +1,9 @@
libreadline7
libreadline8
obsoletes "readline-<targettype> <= <version>"
provides "readline-<targettype> = <version>"
readline-devel
requires -readline-<targettype>
requires "libreadline7-<targettype> = <version>"
requires "libreadline8-<targettype> = <version>"
conflicts "readline5-devel-<targettype>"
conflicts "readline6-devel-<targettype>"
conflicts "readline7-devel-<targettype>"

22
readline-5.2-conf.patch
View File

@ -1,12 +1,12 @@
---
lib/readline/bind.c | 55 ++++++++++++++++++++++++++++++++++---------
lib/readline/doc/rluser.texi | 3 +-
lib/readline/rlconf.h | 2 -
lib/readline/bind.c | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
lib/readline/doc/rluser.texi | 3 ++-
lib/readline/rlconf.h | 2 +-
3 files changed, 47 insertions(+), 13 deletions(-)
--- lib/readline/bind.c
+++ lib/readline/bind.c 2017-04-26 13:07:22.115249970 +0000
@@ -826,6 +826,9 @@ rl_function_of_keyseq (keyseq, map, type
+++ lib/readline/bind.c 2018-11-29 08:33:08.921317296 +0000
@@ -850,6 +850,9 @@ rl_function_of_keyseq_len (const char *k
/* The last key bindings file read. */
static char *last_readline_init_file = (char *)NULL;
@ -16,7 +16,7 @@
/* The file we're currently reading key bindings from. */
static const char *current_readline_init_file;
static int current_readline_init_include_level;
@@ -891,11 +894,14 @@ rl_re_read_init_file (count, ignore)
@@ -917,11 +920,14 @@ rl_re_read_init_file (int count, int ign
return r;
}
@ -32,7 +32,7 @@
4. /etc/inputrc
If the file existed and could be opened and read, 0 is returned,
otherwise errno is returned. */
@@ -905,18 +911,39 @@ rl_read_init_file (filename)
@@ -930,18 +936,39 @@ rl_read_init_file (const char *filename)
{
/* Default the filename. */
if (filename == 0)
@ -80,7 +80,7 @@
#if defined (__MSDOS__)
if (_rl_read_init_file (filename, 0) == 0)
return 0;
@@ -1467,7 +1494,14 @@ remove_trailing:
@@ -1681,7 +1708,14 @@ remove_trailing:
rl_macro_bind (seq, &funname[1], _rl_keymap);
}
else
@ -96,7 +96,7 @@
xfree (seq);
return 0;
@@ -1632,7 +1666,6 @@ typedef int _rl_sv_func_t PARAMS((const
@@ -1850,7 +1884,6 @@ typedef int _rl_sv_func_t PARAMS((const
#define V_INT 2
/* Forward declarations */
@ -105,7 +105,7 @@
static int sv_dispprefix PARAMS((const char *));
static int sv_compquery PARAMS((const char *));
--- lib/readline/doc/rluser.texi
+++ lib/readline/doc/rluser.texi 2017-04-26 12:57:24.590906421 +0000
+++ lib/readline/doc/rluser.texi 2018-11-29 08:33:08.921317296 +0000
@@ -349,7 +349,8 @@ file is taken from the value of the envi
@end ifclear
that variable is unset, the default is @file{~/.inputrc}. If that
@ -117,7 +117,7 @@
When a program which uses the Readline library starts up, the
init file is read, and the key bindings are set.
--- lib/readline/rlconf.h
+++ lib/readline/rlconf.h 2017-04-26 12:57:24.586906499 +0000
+++ lib/readline/rlconf.h 2018-11-29 08:33:08.921317296 +0000
@@ -37,7 +37,7 @@
#define HANDLE_SIGNALS

24
readline-6.2-endpw.dif
View File

@ -1,24 +0,0 @@
---
lib/readline/complete.c | 4 ++++
1 file changed, 4 insertions(+)
--- lib/readline/complete.c
+++ lib/readline/complete.c 2011-11-21 12:51:35.695646715 +0000
@@ -89,6 +89,7 @@ typedef int QSFUNC ();
defined. */
#if defined (HAVE_GETPWENT) && (!defined (HAVE_GETPW_DECLS) || defined (_POSIX_SOURCE))
extern struct passwd *getpwent PARAMS((void));
+extern void endpwent ();
#endif /* HAVE_GETPWENT && (!HAVE_GETPW_DECLS || _POSIX_SOURCE) */
/* If non-zero, then this is the address of a function to call when
@@ -2316,6 +2317,9 @@ rl_username_completion_function (text, s
if (first_char == '~')
rl_filename_completion_desired = 1;
+#if defined (HAVE_GETPWENT)
+ /* endpwent (); */
+#endif
return (value);
}
#endif /* !__WIN32__ && !__OPENNT */

4
readline-6.2-metamode.patch
View File

@ -3,8 +3,8 @@
1 file changed, 1 insertion(+)
--- lib/readline/bind.c
+++ lib/readline/bind.c 2011-03-04 15:00:17.332426313 +0000
@@ -1613,6 +1613,7 @@ static const struct {
+++ lib/readline/bind.c 2018-09-20 06:40:06.799183658 +0000
@@ -1827,6 +1827,7 @@ static const struct {
#if defined (VISIBLE_STATS)
{ "visible-stats", &rl_visible_stats, 0 },
#endif /* VISIBLE_STATS */

10
readline-6.2-xmalloc.dif
View File

@ -5,8 +5,8 @@
3 files changed, 16 insertions(+)
--- xfree.c
+++ xfree.c 2012-10-17 12:48:37.862344784 +0000
@@ -48,3 +48,6 @@ xfree (string)
+++ xfree.c 2018-09-20 06:41:57.485165699 +0000
@@ -47,3 +47,6 @@ xfree (PTR_T string)
if (string)
free (string);
}
@ -14,8 +14,8 @@
+#undef xfree
+extern void xfree PARAMS((void *)) __attribute__ ((weak, alias ("_rl_xfree")));
--- xmalloc.c
+++ xmalloc.c 2012-10-17 12:48:28.430844890 +0000
@@ -77,3 +77,8 @@ xrealloc (pointer, bytes)
+++ xmalloc.c 2018-09-20 06:41:57.485165699 +0000
@@ -73,3 +73,8 @@ xrealloc (PTR_T pointer, size_t bytes)
memory_error_and_abort ("xrealloc");
return (temp);
}
@ -25,7 +25,7 @@
+extern PTR_T xmalloc PARAMS((size_t)) __attribute__ ((weak, alias ("_rl_xmalloc")));
+extern PTR_T xrealloc PARAMS((void *, size_t)) __attribute__ ((weak, alias ("_rl_xrealloc")));
--- xmalloc.h
+++ xmalloc.h 2012-10-17 12:27:20.325156790 +0000
+++ xmalloc.h 2018-09-20 06:41:57.485165699 +0000
@@ -38,6 +38,14 @@
#endif /* !PTR_T */

8
readline-6.3-destdir.patch
View File

@ -4,7 +4,7 @@
2 files changed, 32 insertions(+), 24 deletions(-)
--- shlib/Makefile.in
+++ shlib/Makefile.in 2014-04-17 10:51:05.898235056 +0000
+++ shlib/Makefile.in 2018-09-20 06:43:10.055842585 +0000
@@ -59,6 +59,7 @@ bindir = @bindir@
libdir = @libdir@
datadir = @datadir@
@ -36,7 +36,7 @@
uninstall-unsupported:
--- support/shlib-install
+++ support/shlib-install 2014-04-17 10:54:11.938235782 +0000
+++ support/shlib-install 2018-09-20 06:44:54.757933583 +0000
@@ -3,7 +3,7 @@
# shlib-install - install a shared library and do any necessary host-specific
# post-installation configuration (like ldconfig)
@ -108,8 +108,8 @@
case "$host_os" in
hpux*|darwin*|macosx*|linux*|solaris2*)
if [ -z "$uninstall" ]; then
- chmod 555 ${INSTALLDIR}/${LIBNAME}
+ chmod 555 ${DESTDIR}${INSTALLDIR}/${LIBNAME}
- chmod 755 ${INSTALLDIR}/${LIBNAME}
+ chmod 755 ${DESTDIR}${INSTALLDIR}/${LIBNAME}
fi ;;
cygwin*|mingw*)
IMPLIBNAME=`echo ${LIBNAME} \

18
readline-6.3-input.dif
View File

@ -4,17 +4,17 @@
2 files changed, 13 insertions(+), 1 deletion(-)
--- lib/readline/input.c
+++ lib/readline/input.c 2003-03-17 19:03:51.000000000 +0000
@@ -489,6 +489,8 @@ rl_read_key ()
+++ lib/readline/input.c 2018-11-29 08:29:58.432878428 +0000
@@ -501,6 +501,8 @@ rl_read_key (void)
return (c);
}
+extern int _rl_read_zero_char_from_tty;
+
int
rl_getc (stream)
FILE *stream;
@@ -526,7 +528,10 @@ rl_getc (stream)
rl_getc (FILE *stream)
{
@@ -542,7 +544,10 @@ rl_getc (FILE *stream)
/* If zero characters are returned, then the file that we are
reading from is empty! Return EOF in that case. */
if (result == 0)
@ -27,8 +27,8 @@
#if defined (__BEOS__)
if (errno == EINTR)
--- lib/readline/readline.c
+++ lib/readline/readline.c 2014-04-17 10:24:16.302236347 +0000
@@ -522,6 +522,9 @@ _rl_internal_char_cleanup ()
+++ lib/readline/readline.c 2018-11-29 08:29:58.432878428 +0000
@@ -525,6 +525,9 @@ _rl_internal_char_cleanup (void)
_rl_erase_entire_line ();
}
@ -37,8 +37,8 @@
+
STATIC_CALLBACK int
#if defined (READLINE_CALLBACKS)
readline_internal_char ()
@@ -570,6 +573,10 @@ readline_internal_charloop ()
readline_internal_char (void)
@@ -573,6 +576,10 @@ readline_internal_charloop (void)
c = rl_read_key ();
RL_UNSETSTATE(RL_STATE_READCMD);

17
readline-6.3-rltrace.patch
View File

@ -2,12 +2,12 @@ Even if used only by developers to debug readline library do not open
temporary files from public location without O_EXCL (bcn#868822).
---
lib/readline/util.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
lib/readline/util.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- lib/readline/util.c
+++ lib/readline/util.c 2014-04-17 10:29:43.157274616 +0000
@@ -504,10 +504,12 @@ _rl_trace (va_alist)
+++ lib/readline/util.c 2018-09-20 06:47:51.238715688 +0000
@@ -487,10 +487,12 @@ _rl_trace (va_alist)
if (_rl_tracefp == 0)
_rl_tropen ();
@ -21,20 +21,19 @@ temporary files from public location without O_EXCL (bcn#868822).
va_end (args);
}
@@ -527,7 +529,7 @@ _rl_tropen ()
@@ -510,7 +512,7 @@ _rl_tropen (void)
#endif
sprintf (fnbuf, "%s/rltrace.%ld", x, (long)getpid());
snprintf (fnbuf, sizeof (fnbuf), "%s/rltrace.%ld", x, (long)getpid());
unlink(fnbuf);
- _rl_tracefp = fopen (fnbuf, "w+");
+ _rl_tracefp = fopen (fnbuf, "w+xe");
return _rl_tracefp != 0;
}
@@ -535,8 +537,8 @@ int
_rl_trclose ()
@@ -519,7 +521,8 @@ _rl_trclose (void)
{
int r;
-
- r = fclose (_rl_tracefp);
+ if (_rl_tracefp)
+ r = fclose (_rl_tracefp);

BIN
readline-7.0-patches.tar.bz2 (Stored with Git LFS)
View File

Binary file not shown.

2
readline-7.0-screen.patch
View File

@ -6,7 +6,7 @@ Special for screen and its new TERM setting like TERM=screen.xterm-256color
--- lib/readline/bind.c
+++ readline-7.0/bind.c 2018-09-28 11:22:31.001503017 +0000
@@ -1127,6 +1127,15 @@ parser_if (args)
@@ -1209,6 +1209,15 @@ parser_if (args)
`$if term=sun-cmd' into their .inputrc. */
_rl_parsing_conditionalized_out = _rl_stricmp (args + 5, tname) &&
_rl_stricmp (args + 5, rl_terminal_name);

BIN
readline-7.0.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

3
readline-8.0-patches.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0be8450c126e2b0048fae7a139f1140f48456ae6e794010f81a166ddfb5b9a66
size 249

36
readline-7.0.dif → readline-8.0.dif
View File

@ -10,11 +10,11 @@
8 files changed, 27 insertions(+), 12 deletions(-)
--- Makefile.in
+++ Makefile.in 2016-09-14 08:59:09.830092311 +0000
@@ -233,10 +233,8 @@ uninstall-headers:
maybe-uninstall-headers: uninstall-headers
+++ Makefile.in 2018-09-20 06:52:00.770160356 +0000
@@ -251,10 +251,8 @@ uninstall-pc:
maybe-uninstall-pc: uninstall-pc
install-static: installdirs $(STATIC_LIBS) install-headers install-doc install-examples
install-static: installdirs $(STATIC_LIBS) install-headers install-doc ${install_examples} install-pc
- -$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old
$(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a
-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a
@ -22,7 +22,7 @@
$(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a
-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a
@@ -266,7 +264,7 @@ install-doc: installdirs
@@ -285,7 +283,7 @@ install-doc: installdirs
$(INSTALL_DATA) $(OTHER_DOCS) $(DESTDIR)$(docdir)
-( if test -d doc ; then \
cd doc && \
@ -32,8 +32,8 @@
uninstall-doc:
--- complete.c
+++ complete.c 2016-09-14 08:59:09.830092311 +0000
@@ -1152,7 +1152,7 @@ _rl_find_completion_word (fp, dp)
+++ complete.c 2018-09-20 06:51:00.535262270 +0000
@@ -1133,7 +1133,7 @@ _rl_find_completion_word (int *fp, int *
/* We didn't find an unclosed quoted substring upon which to do
completion, so use the word break characters to find the
substring on which to complete. */
@ -42,7 +42,7 @@
{
scan = rl_line_buffer[rl_point];
@@ -2229,7 +2229,7 @@ rl_completion_matches (text, entry_funct
@@ -2182,7 +2182,7 @@ rl_completion_matches (const char *text,
match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *));
match_list[1] = (char *)NULL;
@ -51,7 +51,7 @@
{
if (RL_SIG_RECEIVED ())
{
@@ -2303,7 +2303,7 @@ rl_username_completion_function (text, s
@@ -2254,7 +2254,7 @@ rl_username_completion_function (const c
}
#if defined (HAVE_GETPWENT)
@ -61,7 +61,7 @@
/* Null usernames should result in all users as possible completions. */
if (namelen == 0 || (STREQN (username, entry->pw_name, namelen)))
--- doc/Makefile.in
+++ doc/Makefile.in 2016-09-14 08:59:09.830092311 +0000
+++ doc/Makefile.in 2018-09-20 06:51:00.535262270 +0000
@@ -107,7 +107,7 @@ DIST_DOCS = $(DVIOBJ) $(PSOBJ) $(HTMLOBJ
# $(RM) $@
# -${TEXI2PDF} $<
@ -72,7 +72,7 @@
xdist: $(DIST_DOCS)
--- doc/readline.3
+++ doc/readline.3 2016-09-14 08:59:09.830092311 +0000
+++ doc/readline.3 2018-09-20 06:51:00.535262270 +0000
@@ -119,6 +119,14 @@ environment variable. If that variable
.IR ~/.inputrc .
If that file does not exist or cannot be read, the ultimate default is
@ -88,7 +88,7 @@
When a program which uses the readline library starts up, the
init file is read, and the key bindings and variables are set.
There are only a few basic constructs allowed in the
@@ -1457,6 +1465,9 @@ VI Command Mode functions
@@ -1505,6 +1513,9 @@ VI Command Mode functions
.TP
.FN ~/.inputrc
Individual \fBreadline\fP initialization file
@ -99,7 +99,7 @@
.SH AUTHORS
Brian Fox, Free Software Foundation
--- history.h
+++ history.h 2016-09-14 08:59:09.830092311 +0000
+++ history.h 2018-09-20 06:51:00.535262270 +0000
@@ -32,6 +32,7 @@ extern "C" {
# include "rlstdc.h"
# include "rltypedefs.h"
@ -109,8 +109,8 @@
# include <readline/rltypedefs.h>
#endif
--- readline.c
+++ readline.c 2016-09-14 08:59:09.830092311 +0000
@@ -851,8 +851,11 @@ _rl_dispatch_subseq (key, map, got_subse
+++ readline.c 2018-09-20 06:51:00.535262270 +0000
@@ -844,8 +844,11 @@ _rl_dispatch_subseq (register int key, K
{
/* Special case rl_do_lowercase_version (). */
if (func == rl_do_lowercase_version)
@ -125,7 +125,7 @@
rl_executing_keymap = map;
rl_executing_key = key;
--- readline.h
+++ readline.h 2016-09-14 08:59:09.830092311 +0000
+++ readline.h 2018-09-20 06:51:00.535262270 +0000
@@ -32,6 +32,7 @@ extern "C" {
# include "keymaps.h"
# include "tilde.h"
@ -134,7 +134,7 @@
# include <readline/rlstdc.h>
# include <readline/rltypedefs.h>
# include <readline/keymaps.h>
@@ -467,7 +468,7 @@ extern char *rl_filename_completion_func
@@ -477,7 +478,7 @@ extern char *rl_filename_completion_func
extern int rl_completion_mode PARAMS((rl_command_func_t *));
@ -144,7 +144,7 @@
extern void free_undo_list PARAMS((void));
extern int maybe_save_line PARAMS((void));
--- support/shobj-conf
+++ support/shobj-conf 2016-09-14 08:59:09.830092311 +0000
+++ support/shobj-conf 2018-09-20 06:51:00.535262270 +0000
@@ -126,10 +126,11 @@ sunos5*|solaris2*)
linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
SHOBJ_CFLAGS=-fPIC

3
readline-8.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461
size 2975937

65
readline.changes
View File

@ -1,8 +1,73 @@
-------------------------------------------------------------------
Wed Jan 9 12:51:18 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Update to readline-8.0 final
-------------------------------------------------------------------
Fri Dec 21 13:12:27 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Update to readline-8.0-rc1 for testing
-------------------------------------------------------------------
Thu Nov 29 08:39:29 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Update to readline-8.0-beta2 for testing
j. Readline now allows application-defined keymap names; there is a new public
function, rl_set_keymap_name(), to do that.
k. The "Insert" keypad key, if available, now puts readline into overwrite
mode.
readline-5.2-conf.patch
- Port and modify patches
* readline-6.2-metamode.patch
* readline-6.3-input.dif
* readline-7.0-screen.patch
* readline-8.0.dif
-------------------------------------------------------------------
Fri Sep 28 11:29:32 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Rework patch readline-7.0-screen.patch
-------------------------------------------------------------------
Thu Sep 20 07:38:14 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Update to readline-8.0-beta for testing
a. Non-incremental vi-mode search (`N', `n') can search for a shell pattern, as
Posix specifies (uses fnmatch(3) if available).
b. There are new `next-screen-line' and `previous-screen-line' bindable
commands, which move the cursor to the same column in the next, or previous,
physical line, respectively.
c. There are default key bindings for control-arrow-key key combinations.
d. A negative argument (-N) to `quoted-insert' means to insert the next N
characters using quoted-insert.
e. New public function: rl_check_signals(), which allows applications to
respond to signals that readline catches while waiting for input using
a custom read function.
f. There is new support for conditionally testing the readline version in an
inputrc file, with a full set of arithmetic comparison operators available.
g. There is a simple variable comparison facility available for use within an
inputrc file. Allowable operators are equality and inequality; string
variables may be compared to a value; boolean variables must be compared to
either `on' or `off'; variable names are separated from the operator by
whitespace.
h. The history expansion library now understands command and process
substitution and extended globbing and allows them to appear anywhere in a
word.
i. The history library has a new variable that allows applications to set the
initial quoting state, so quoting state can be inherited from a previous
line.
- Remove not used patch readline-6.2-endpw.dif
- Port and modify patches
* readline-5.2-conf.patch
* readline-6.2-metamode.patch
* readline-6.2-xmalloc.dif
* readline-6.3-destdir.patch
* readline-6.3-input.dif
* readline-6.3-rltrace.patch
* readline-7.0-screen.patch
- Port and rename patch readline-7.0.dif which is now readline-8.0.dif
- Modify baselibs.conf
-------------------------------------------------------------------
Wed Jun 13 11:35:34 UTC 2018 - werner@suse.de

29
readline.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package readline
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@ -26,8 +26,8 @@ BuildRequires: ncurses-devel
BuildRequires: patchutils
BuildRequires: pkg-config
BuildRequires: sed
%define rextend %nil
Version: 7.0
%define rextend %nil
Version: 8.0
Release: 0
Summary: The readline library
License: GPL-3.0-or-later
@ -41,7 +41,6 @@ Patch0: readline-%{version}.dif
Patch1: readline-6.3-input.dif
Patch2: readline-5.2-conf.patch
Patch3: readline-6.2-metamode.patch
Patch4: readline-6.2-endpw.dif
Patch5: readline-6.2-xmalloc.dif
Patch6: readline-6.3-destdir.patch
Patch7: readline-6.3-rltrace.patch
@ -53,7 +52,7 @@ The readline library is used by the Bourne Again Shell (bash, the
standard command interpreter) for easy editing of command lines. This
includes history and search functionality.
%package -n libreadline7
%package -n libreadline8
Summary: The Readline Library
Group: System/Libraries
Provides: bash:/%{_lib}/libreadline.so.%{rl_major}
@ -61,7 +60,7 @@ Recommends: readline-doc = %{version}
Provides: readline = %{version}
Obsoletes: readline <= 6.3
%description -n libreadline7
%description -n libreadline8
The readline library is used by the Bourne Again Shell (bash, the
standard command interpreter) for easy editing of command lines. This
includes history and search functionality.
@ -69,7 +68,7 @@ includes history and search functionality.
%package devel
Summary: Development files for readline
Group: Development/Libraries/C and C++
Requires: libreadline7 = %{version}
Requires: libreadline8 = %{version}
Requires: ncurses-devel
Recommends: readline-doc = %{version}
@ -114,7 +113,6 @@ done
%patch1 -p2 -b .zerotty
%patch2 -p2 -b .conf
%patch3 -p2 -b .metamode
#%patch4 -p2 -b .endpw
%patch5 -p0 -b .xm
%patch6 -p0 -b .destdir
%patch7 -p2 -b .tmp
@ -173,7 +171,7 @@ LARGEFILE="$(getconf LFS_CFLAGS)"
rl_signal_event_hook;
};
EOF
CFLAGS="%{optflags} $LARGEFILE -D_GNU_SOURCE -Wall -g"
CFLAGS="%{optflags} $LARGEFILE -D_GNU_SOURCE -D_RPM_OPT_FLAGS -g"
LDFLAGS=""
cflags -Wuninitialized CFLAGS
cflags -Wextra CFLAGS
@ -215,16 +213,18 @@ rm -vf %{buildroot}/%{_lib}/libhistory.so.%{version}*old
rm -vf %{buildroot}/%{_lib}/libreadline.so.%{version}*old
rm -vf %{buildroot}/%{_lib}/libhistory.so
rm -vf %{buildroot}/%{_lib}/libreadline.so
mkdir -p %{buildroot}/%{_libdir}
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
ln -sf /%{_lib}/libhistory.so.%{version} %{buildroot}/%{_libdir}/libhistory.so
ln -sf /%{_lib}/libreadline.so.%{version} %{buildroot}/%{_libdir}/libreadline.so
mv -vf %{buildroot}/%{_lib}/libhistory.a %{buildroot}/%{_libdir}/libhistory.a
mv -vf %{buildroot}/%{_lib}/libreadline.a %{buildroot}/%{_libdir}/libreadline.a
mv -vf %{buildroot}/%{_lib}/pkgconfig/readline.pc \
%{buildroot}/%{_libdir}/pkgconfig/readline.pc
rm -vrf %{buildroot}%{_datadir}/readline/
%post -n libreadline7 -p /sbin/ldconfig
%post -n libreadline8 -p /sbin/ldconfig
%postun -n libreadline7 -p /sbin/ldconfig
%postun -n libreadline8 -p /sbin/ldconfig
%post doc
%install_info --info-dir=%{_infodir} %{_infodir}/history.info.gz
@ -236,7 +236,7 @@ rm -vrf %{buildroot}%{_datadir}/readline/
%install_info_delete --info-dir=%{_infodir} %{_infodir}/readline.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/rluserman.info.gz
%files -n libreadline7
%files -n libreadline8
%license COPYING
/%{_lib}/libhistory.so.%{rl_major}
/%{_lib}/libhistory.so.%{version}
@ -247,6 +247,7 @@ rm -vrf %{buildroot}%{_datadir}/readline/
%{_includedir}/readline/
%{_libdir}/libhistory.so
%{_libdir}/libreadline.so
%{_libdir}/pkgconfig/readline.pc
%files devel-static
%{_libdir}/libhistory.a