diff options
| -rw-r--r-- | packaging/baselibs.conf | 8 | ||||
| -rw-r--r-- | packaging/readline-4.3-input.dif | 50 | ||||
| -rw-r--r-- | packaging/readline-5.1-destdir.patch | 195 | ||||
| -rw-r--r-- | packaging/readline-5.2-conf.patch | 118 | ||||
| -rw-r--r-- | packaging/readline-5.2-wrap.patch | 14 | ||||
| -rw-r--r-- | packaging/readline-5.2.dif | 139 | ||||
| -rw-r--r-- | packaging/readline.spec | 15 |
7 files changed, 4 insertions, 535 deletions
diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf index 074a6f7..6304087 100644 --- a/packaging/baselibs.conf +++ b/packaging/baselibs.conf @@ -1,6 +1,6 @@ -libreadline5 +libreadline obsoletes "readline-<targettype> <= <version>" provides "readline-<targettype> = <version>" -readline5-devel - requires -readline5-<targettype> - requires "libreadline5-<targettype> = <version>" +readline-devel + requires -readline-<targettype> + requires "libreadline-<targettype> = <version>" diff --git a/packaging/readline-4.3-input.dif b/packaging/readline-4.3-input.dif deleted file mode 100644 index b960cfb..0000000 --- a/packaging/readline-4.3-input.dif +++ /dev/null @@ -1,50 +0,0 @@ -Index: input.c -=================================================================== ---- input.c.orig -+++ input.c -@@ -448,6 +448,8 @@ rl_read_key () - return (c); - } - -+extern int _rl_read_zero_char_from_tty; -+ - int - rl_getc (stream) - FILE *stream; -@@ -469,7 +471,10 @@ rl_getc (stream) - /* If zero characters are returned, then the file that we are - reading from is empty! Return EOF in that case. */ - if (result == 0) -- return (EOF); -+ { -+ _rl_read_zero_char_from_tty = 1; -+ return (EOF); -+ } - - #if defined (__BEOS__) - if (errno == EINTR) -Index: readline.c -=================================================================== ---- readline.c.orig -+++ readline.c -@@ -440,6 +440,9 @@ _rl_internal_char_cleanup () - _rl_erase_entire_line (); - } - -+/* Catch EOF from tty, do not return command line */ -+int _rl_read_zero_char_from_tty = 0; -+ - STATIC_CALLBACK int - #if defined (READLINE_CALLBACKS) - readline_internal_char () -@@ -484,6 +487,10 @@ readline_internal_charloop () - c = rl_read_key (); - RL_UNSETSTATE(RL_STATE_READCMD); - -+ /* Return here if terminal is closed */ -+ if (c == EOF && _rl_read_zero_char_from_tty) -+ return (rl_done = 1); -+ - /* look at input.c:rl_getc() for the circumstances under which this will - be returned; punt immediately on read error without converting it to - a newline. */ diff --git a/packaging/readline-5.1-destdir.patch b/packaging/readline-5.1-destdir.patch deleted file mode 100644 index f71c05c..0000000 --- a/packaging/readline-5.1-destdir.patch +++ /dev/null @@ -1,195 +0,0 @@ -Index: shlib/Makefile.in -=================================================================== ---- shlib/Makefile.in.orig -+++ shlib/Makefile.in -@@ -57,6 +57,7 @@ bindir = @bindir@ - libdir = @libdir@ - datadir = @datadir@ - localedir = $(datadir)/locale -+linkagedir = $(libdir) - - # Support an alternate destination root directory for package building - DESTDIR = -@@ -181,13 +182,13 @@ installdirs: $(topdir)/support/mkdirs - -$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(libdir) - - install: installdirs $(SHLIB_STATUS) -- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY) -- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_READLINE) -+ $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -dd $(DESTDIR) -d $(libdir) -l $(linkagedir) -b $(bindir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY) -+ $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -dd $(DESTDIR) -d $(libdir) -l $(linkagedir) -b $(bindir) -i "$(INSTALL_DATA)" $(SHARED_READLINE) - @echo install: you may need to run ldconfig - - uninstall: -- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_HISTORY) -- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_READLINE) -+ $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -dd $(DESTDIR) -d $(libdir) -l $(linkagedir) -b $(bindir) -U $(SHARED_HISTORY) -+ $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -dd $(DESTDIR) -d $(libdir) -l $(linkagedir) -b $(bindir) -U $(SHARED_READLINE) - @echo uninstall: you may need to run ldconfig - - clean mostlyclean: force -Index: support/shlib-install -=================================================================== ---- support/shlib-install.orig -+++ support/shlib-install -@@ -3,7 +3,7 @@ - # shlib-install - install a shared library and do any necessary host-specific - # post-installation configuration (like ldconfig) - # --# usage: shlib-install [-D] -O host_os -d installation-dir [-b bin-dir] -i install-prog [-U] library -+# usage: shlib-install [-D] -O host_os -d installation-dir [-l linkage-dir] [-b bin-dir] -i install-prog [-U] library - # - # Chet Ramey - # chet@po.cwru.edu -@@ -12,10 +12,12 @@ - # defaults - # - INSTALLDIR=/usr/local/lib -+LINKAGEDIR= - LDCONFIG=ldconfig -+DESTDIR= - - PROGNAME=`basename $0` --USAGE="$PROGNAME [-D] -O host_os -d installation-dir [-b bin-dir] -i install-prog [-U] library" -+USAGE="$PROGNAME [-D] -O host_os -d installation-dir [-l linkage-dir] [-b bin-dir] -i install-prog [-U] library" - - # process options - -@@ -23,14 +25,19 @@ while [ $# -gt 0 ]; do - case "$1" in - -O) shift; host_os="$1"; shift ;; - -d) shift; INSTALLDIR="$1"; shift ;; -+ -dd) shift; DESTDIR=$1; shift ;; - -b) shift; BINDIR="$1" ; shift ;; - -i) shift; INSTALLPROG="$1" ; shift ;; -+ -l) shift; LINKAGEDIR="$1" ; shift ;; - -D) echo=echo ; shift ;; - -U) uninstall=true ; shift ;; - -*) echo "$USAGE" >&2 ; exit 2;; - *) break ;; - esac - done -+if [ -z "$LINKAGEDIR" ]; then -+ LINKAGEDIR="$INSTALLDIR" -+fi - - # set install target name - LIBNAME="$1" -@@ -48,18 +55,18 @@ LN="ln -s" - # pre-install - - if [ -z "$uninstall" ]; then -- ${echo} $RM ${INSTALLDIR}/${LIBNAME}.${OLDSUFF} -- if [ -f "$INSTALLDIR/$LIBNAME" ]; then -- ${echo} $MV $INSTALLDIR/$LIBNAME ${INSTALLDIR}/${LIBNAME}.${OLDSUFF} -+ ${echo} $RM ${DESTDIR}${INSTALLDIR}/${LIBNAME}.${OLDSUFF} -+ if [ -f "${DESTDIR}$INSTALLDIR/$LIBNAME" ]; then -+ ${echo} $MV ${DESTDIR}$INSTALLDIR/$LIBNAME ${DESTDIR}${INSTALLDIR}/${LIBNAME}.${OLDSUFF} - fi - fi - - # install/uninstall - - if [ -z "$uninstall" ] ; then -- ${echo} eval ${INSTALLPROG} $LIBNAME ${INSTALLDIR}/${LIBNAME} -+ ${echo} eval ${INSTALLPROG} $LIBNAME ${DESTDIR}${INSTALLDIR}/${LIBNAME} - else -- ${echo} ${RM} ${INSTALLDIR}/${LIBNAME} -+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/${LIBNAME} - fi - - # post-install/uninstall -@@ -71,7 +78,7 @@ fi - case "$host_os" in - hpux*|darwin*|macosx*|linux*) - if [ -z "$uninstall" ]; then -- chmod 555 ${INSTALLDIR}/${LIBNAME} -+ chmod 555 ${DESTDIR}${INSTALLDIR}/${LIBNAME} - fi ;; - cygwin*) - IMPLIBNAME=`echo ${LIBNAME} \ -@@ -109,8 +116,8 @@ case "$LIBNAME" in - LINK1=`echo $LIBNAME | sed 's:\(.*\)\.[0-9]\.[0-9]:\1:'` # libname.dylib - esac - --INSTALL_LINK1='${echo} cd $INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK1' --INSTALL_LINK2='${echo} cd $INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK2' -+INSTALL_LINK1='${echo} cd ${DESTDIR}$INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK1' -+INSTALL_LINK2='${echo} cd ${DESTDIR}$INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK2' - - # - # Create symlinks to the installed library. This section is incomplete. -@@ -118,27 +125,27 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR && - case "$host_os" in - *linux*) - # libname.so.M -> libname.so.M.N -- ${echo} ${RM} ${INSTALLDIR}/$LINK2 -+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK2 - if [ -z "$uninstall" ]; then - eval $INSTALL_LINK2 - fi - - # libname.so -> libname.so.M -- ${echo} ${RM} ${INSTALLDIR}/$LINK1 -+ ${echo} ${RM} ${DESTDIR}${LINKAGEDIR}/$LINK1 - if [ -z "$uninstall" ]; then -- ${echo} cd $INSTALLDIR && ${echo} ${LN} $LINK2 $LINK1 -+ ${echo} ln -s ${INSTALLDIR}/$LIBNAME ${DESTDIR}${LINKAGEDIR}/$LINK1 - fi - ;; - - bsdi4*|*gnu*|darwin*|macosx*|k*bsd*-gnu) - # libname.so.M -> libname.so.M.N -- ${echo} ${RM} ${INSTALLDIR}/$LINK2 -+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK2 - if [ -z "$uninstall" ]; then - eval $INSTALL_LINK2 - fi - - # libname.so -> libname.so.M.N -- ${echo} ${RM} ${INSTALLDIR}/$LINK1 -+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1 - if [ -z "$uninstall" ]; then - eval $INSTALL_LINK1 - fi -@@ -146,7 +153,7 @@ bsdi4*|*gnu*|darwin*|macosx*|k*bsd*-gnu) - - solaris2*|aix4.[2-9]*|osf*|irix[56]*|sysv[45]*|dgux*) - # libname.so -> libname.so.M -- ${echo} ${RM} ${INSTALLDIR}/$LINK1 -+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1 - if [ -z "$uninstall" ]; then - eval $INSTALL_LINK1 - fi -@@ -157,19 +164,19 @@ solaris2*|aix4.[2-9]*|osf*|irix[56]*|sys - freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*) - if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then - # libname.so -> libname.so.M -- ${echo} ${RM} ${INSTALLDIR}/$LINK1 -+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1 - if [ -z "$uninstall" ]; then - eval $INSTALL_LINK1 - fi - else - # libname.so.M -> libname.so.M.N -- ${echo} ${RM} ${INSTALLDIR}/$LINK2 -+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK2 - if [ -z "$uninstall" ]; then - eval $INSTALL_LINK2 - fi - - # libname.so -> libname.so.M.N -- ${echo} ${RM} ${INSTALLDIR}/$LINK1 -+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1 - if [ -z "$uninstall" ]; then - eval $INSTALL_LINK1 - fi -@@ -178,7 +185,7 @@ freebsd[3-9]*|freebsdelf[3-9]*|freebsdao - - hpux1*) - # libname.sl -> libname.M -- ${echo} ${RM} ${INSTALLDIR}/$LINK1.sl -+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1.sl - if [ -z "$uninstall" ]; then - eval $INSTALL_LINK1 - fi diff --git a/packaging/readline-5.2-conf.patch b/packaging/readline-5.2-conf.patch deleted file mode 100644 index cf5b989..0000000 --- a/packaging/readline-5.2-conf.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- bind.c -+++ bind.c 2006-11-13 17:20:23.000000000 +0100 -@@ -752,6 +752,9 @@ rl_function_of_keyseq (keyseq, map, type - /* The last key bindings file read. */ - static char *last_readline_init_file = (char *)NULL; - -+/* Flag to read system init file */ -+static int read_system_init_file = 0; -+ - /* The file we're currently reading key bindings from. */ - static const char *current_readline_init_file; - static int current_readline_init_include_level; -@@ -815,11 +818,14 @@ rl_re_read_init_file (count, ignore) - return r; - } - -+/* Forward declarations */ -+static int sv_bell_style PARAMS((const char *)); -+ - /* Do key bindings from a file. If FILENAME is NULL it defaults - to the first non-null filename from this list: - 1. the filename used for the previous call - 2. the value of the shell variable `INPUTRC' -- 3. ~/.inputrc -+ 3. /etc/inputrc and ~/.inputrc - 4. /etc/inputrc - If the file existed and could be opened and read, 0 is returned, - otherwise errno is returned. */ -@@ -831,16 +837,37 @@ rl_read_init_file (filename) - if (filename == 0) - filename = last_readline_init_file; - if (filename == 0) -- filename = sh_get_env_value ("INPUTRC"); -+ { -+ filename = sh_get_env_value ("INPUTRC"); -+ if (filename && !strncmp(SYS_INPUTRC, filename, strlen(SYS_INPUTRC))) -+ { -+ struct stat st; -+ char *default_inputrc = tilde_expand(DEFAULT_INPUTRC); -+ -+ if ((stat(default_inputrc, &st) == 0)) -+ { -+ filename = DEFAULT_INPUTRC; -+ read_system_init_file = 1; -+ } -+ else -+ read_system_init_file = 0; -+ -+ free(default_inputrc); -+ } -+ else -+ read_system_init_file = 1; -+ } - if (filename == 0 || *filename == 0) - { - filename = DEFAULT_INPUTRC; -- /* Try to read DEFAULT_INPUTRC; fall back to SYS_INPUTRC on failure */ -- if (_rl_read_init_file (filename, 0) == 0) -- return 0; -- filename = SYS_INPUTRC; -+ read_system_init_file = 1; - } - -+ sv_bell_style(sh_get_env_value("DEFAULT_BELL_STYLE")); -+ -+ if (read_system_init_file) -+ _rl_read_init_file (SYS_INPUTRC, 1); -+ - #if defined (__MSDOS__) - if (_rl_read_init_file (filename, 0) == 0) - return 0; -@@ -1350,7 +1377,14 @@ rl_parse_and_bind (string) - rl_macro_bind (seq, &funname[1], _rl_keymap); - } - else -- rl_bind_keyseq (seq, rl_named_function (funname)); -+ { -+#if defined (PREFIX_META_HACK) -+ if (_rl_stricmp (funname, "prefix-meta") == 0) -+ rl_generic_bind (ISKMAP, seq, (char *)emacs_meta_keymap, _rl_keymap); -+ else -+#endif -+ rl_bind_keyseq (seq, rl_named_function (funname)); -+ } - - free (seq); - return 0; -@@ -1487,7 +1521,6 @@ typedef int _rl_sv_func_t PARAMS((const - #define V_INT 2 - - /* Forward declarations */ --static int sv_bell_style PARAMS((const char *)); - static int sv_combegin PARAMS((const char *)); - static int sv_compquery PARAMS((const char *)); - static int sv_editmode PARAMS((const char *)); ---- rlconf.h -+++ rlconf.h 2006-11-13 17:21:26.000000000 +0100 -@@ -35,7 +35,7 @@ - #define HANDLE_SIGNALS - - /* Ugly but working hack for binding prefix meta. */ --#define PREFIX_META_HACK -+#undef PREFIX_META_HACK - - /* The next-to-last-ditch effort file name for a user-specific init file. */ - #define DEFAULT_INPUTRC "~/.inputrc" ---- doc/rluser.texi -+++ doc/rluser.texi 2006-11-13 17:23:56.000000000 +0100 -@@ -338,7 +338,8 @@ file is taken from the value of the envi - @end ifclear - that variable is unset, the default is @file{~/.inputrc}. If that - file does not exist or cannot be read, the ultimate default is --@file{/etc/inputrc}. -+@file{/etc/inputrc}. If both @file{~/.inputrc} and @file{/etc/inputrc} -+exist Readline will read first @file{/etc/inputrc} and then @file{~/.inputrc}. - - When a program which uses the Readline library starts up, the - init file is read, and the key bindings are set. diff --git a/packaging/readline-5.2-wrap.patch b/packaging/readline-5.2-wrap.patch deleted file mode 100644 index 4c04168..0000000 --- a/packaging/readline-5.2-wrap.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- display.c -+++ display.c 2006-11-13 16:55:24.000000000 +0100 -@@ -665,7 +665,10 @@ - inv_lbreaks[++newlines] = temp; - #if defined (HANDLE_MULTIBYTE) - if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) -- lpos -= _rl_col_width (local_prompt, n0, num); -+ { -+ if (local_prompt_len > 0) -+ lpos -= _rl_col_width (local_prompt, n0, num); -+ } - else - #endif - lpos -= _rl_screenwidth; diff --git a/packaging/readline-5.2.dif b/packaging/readline-5.2.dif deleted file mode 100644 index e8e8b88..0000000 --- a/packaging/readline-5.2.dif +++ /dev/null @@ -1,139 +0,0 @@ ---- .pkgextract -+++ .pkgextract 2005-12-09 17:09:26.000000000 +0100 -@@ -0,0 +1,5 @@ -+tar Oxfj ../readline-5.2-patches.tar.bz2 | patch -p0 -s -+patch -p2 -s --suffix=".zerotty" < ../readline-4.3-input.dif -+patch -p2 -s --suffix=".wrap" < ../readline-5.2-wrap.patch -+patch -p2 -s --suffix=".conf" < ../readline-5.2-conf.patch -+patch -p0 -s --suffix=".destdir" < ../readline-5.1-destdir.patch ---- Makefile.in -+++ Makefile.in 2005-12-09 17:09:26.000000000 +0100 -@@ -220,10 +220,8 @@ maybe-uninstall-headers: uninstall-heade - install: $(INSTALL_TARGETS) - - install-static: installdirs $(STATIC_LIBS) install-headers install-doc -- -$(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 -- -$(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old - $(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a - -test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a - -@@ -246,7 +244,7 @@ uninstall-shared: maybe-uninstall-header - install-doc: installdirs - -( if test -d doc ; then \ - cd doc && \ -- ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} install; \ -+ ${MAKE} infodir=$(infodir) DESTDIR=${DESTDIR} install; \ - fi ) - - uninstall-doc: ---- complete.c -+++ complete.c 2005-12-09 17:11:19.000000000 +0100 -@@ -883,7 +883,7 @@ _rl_find_completion_word (fp, dp) - /* 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. */ -- while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY)) -+ while ((rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))) - { - scan = rl_line_buffer[rl_point]; - -@@ -1802,7 +1802,7 @@ rl_completion_matches (text, entry_funct - match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *)); - match_list[1] = (char *)NULL; - -- while (string = (*entry_function) (text, matches)) -+ while ((string = (*entry_function) (text, matches))) - { - if (matches + 1 == match_list_size) - match_list = (char **)xrealloc -@@ -1853,7 +1853,7 @@ rl_username_completion_function (text, s - } - - #if defined (HAVE_GETPWENT) -- while (entry = getpwent ()) -+ while ((entry = getpwent ())) - { - /* Null usernames should result in all users as possible completions. */ - if (namelen == 0 || (STREQN (username, entry->pw_name, namelen))) ---- readline.c -+++ readline.c 2005-12-09 17:09:26.000000000 +0100 -@@ -735,7 +735,11 @@ _rl_dispatch_subseq (key, map, got_subse - { - /* Special case rl_do_lowercase_version (). */ - if (func == rl_do_lowercase_version) -- return (_rl_dispatch (_rl_to_lower (key), map)); -+ { -+ if (key == ANYOTHERKEY) -+ return -1; -+ return (_rl_dispatch (_rl_to_lower (key), map)); -+ } - - rl_executing_keymap = map; - ---- readline.h -+++ readline.h 2005-12-09 17:09:26.000000000 +0100 -@@ -445,7 +445,7 @@ extern char *rl_filename_completion_func - - extern int rl_completion_mode PARAMS((rl_command_func_t *)); - --#if 0 -+#ifdef OLD_READLINE - /* Backwards compatibility (compat.c). These will go away sometime. */ - extern void free_undo_list PARAMS((void)); - extern int maybe_save_line PARAMS((void)); ---- doc/Makefile.in -+++ doc/Makefile.in 2005-12-09 17:09:26.000000000 +0100 -@@ -96,7 +96,7 @@ DIST_DOCS = $(DVIOBJ) $(PSOBJ) $(HTMLOBJ - $(RM) $@ - -${DVIPDF} $< - --all: info dvi html ps text -+all: info html - nodvi: info html text - - info: $(INFOOBJ) ---- doc/readline.3 -+++ doc/readline.3 2006-11-13 17:33:27.000000000 +0100 -@@ -118,6 +118,14 @@ environment variable. If that variable - .IR ~/.inputrc . - If that file does not exist or cannot be read, the ultimate default is - .IR /etc/inputrc . -+If both files -+.I ~/.inputrc -+and -+.I /etc/inputrc -+exist readline will read first -+.I /etc/inputrc -+and then -+.IR ~/.inputrc . - 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 -@@ -1270,6 +1278,9 @@ VI Command Mode functions - .TP - .FN ~/.inputrc - Individual \fBreadline\fP initialization file -+.TP -+.FN /etc/inputrc -+System \fBreadline\fP initialization file - .PD - .SH AUTHORS - Brian Fox, Free Software Foundation ---- support/shobj-conf -+++ support/shobj-conf 2006-09-22 16:17:48.000000000 +0200 -@@ -108,10 +108,11 @@ sunos5*|solaris2*) - linux*-*|gnu*-*|k*bsd*-gnu-*) - SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' -- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' -+ SHOBJ_LDFLAGS='-shared' - -- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' -+ SHLIB_XLDFLAGS='-Wl,-rpath-link,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' -+ SHLIB_LIBS=-lncurses - ;; - - freebsd2* | netbsd*) diff --git a/packaging/readline.spec b/packaging/readline.spec index cba764d..01eb0f6 100644 --- a/packaging/readline.spec +++ b/packaging/readline.spec @@ -7,11 +7,6 @@ Url: http://www.gnu.org/software/bash/bash.html Group: System/Libraries Source0: readline-%{rl_vers}.tar.bz2 Source2: baselibs.conf -Patch20: readline-%{rl_vers}.dif -Patch21: readline-4.3-input.dif -Patch22: readline-5.2-wrap.patch -Patch23: readline-5.2-conf.patch -Patch30: readline-5.1-destdir.patch BuildRequires: autoconf BuildRequires: bison BuildRequires: fdupes @@ -50,16 +45,6 @@ includes history and search functionality. %prep %setup -q -n readline-%{rl_vers} -for p in ../readline-%{rl_vers}-patches/*; do - test -e $p || break - echo Patch $p - patch -s -p0 < $p -done -%patch21 -p0 -b .zerotty -%patch22 -p0 -b .wrap -%patch23 -p0 -b .conf -%patch30 -p0 -b .destdir -%patch20 -p0 %build autoconf |