rpms/readline/devel readline-5.2-inv.patch, NONE, 1.1 readline-5.2-shlib.patch, 1.2, 1.3 readline.spec, 1.35, 1.36
Miroslav Lichvar (mlichvar)
fedora-extras-commits at redhat.com
Mon Nov 5 18:26:58 UTC 2007
- Previous message (by thread): rpms/dovecot/F-7 dovecot-1.0.3-winbind.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 dovecot.spec, 1.81, 1.82 sources, 1.30, 1.31
- Next message (by thread): rpms/livecd-tools/F-7 isotostick.sh, NONE, 1.1 livecd-tools.spec, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mlichvar
Update of /cvs/pkgs/rpms/readline/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19722
Modified Files:
readline-5.2-shlib.patch readline.spec
Added Files:
readline-5.2-inv.patch
Log Message:
- fix cursor position when prompt has one invisible character (#358231)
- merge review fixes (#226361)
- fix source URL
readline-5.2-inv.patch:
--- NEW FILE readline-5.2-inv.patch ---
diff -up readline-5.2/display.c.inv readline-5.2/display.c
--- readline-5.2/display.c.inv 2007-10-31 17:14:31.000000000 +0100
+++ readline-5.2/display.c 2007-10-31 17:15:00.000000000 +0100
@@ -943,7 +943,7 @@ rl_redisplay ()
cpos_adjusted == 0 &&
_rl_last_c_pos != o_cpos &&
_rl_last_c_pos > wrap_offset &&
- o_cpos < prompt_last_invisible)
+ o_cpos <= prompt_last_invisible)
_rl_last_c_pos -= wrap_offset;
/* If this is the line with the prompt, we might need to
readline-5.2-shlib.patch:
Index: readline-5.2-shlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/readline/devel/readline-5.2-shlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- readline-5.2-shlib.patch 15 Mar 2007 13:53:59 -0000 1.2
+++ readline-5.2-shlib.patch 5 Nov 2007 18:26:52 -0000 1.3
@@ -25,3 +25,14 @@
;;
freebsd2* | netbsd*)
+--- readline-5.2/shlib/Makefile.in.shlib 2005-08-12 05:56:10.000000000 +0200
++++ readline-5.2/shlib/Makefile.in 2007-11-05 18:59:14.000000000 +0100
+@@ -168,7 +168,7 @@ $(SHARED_READLINE): $(SHARED_OBJ)
+
+ $(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so
+ $(RM) $@
+- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS)
++ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so
+
+ # Since tilde.c is shared between readline and bash, make sure we compile
+ # it with the right flags when it's built as part of readline
Index: readline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readline/devel/readline.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- readline.spec 27 Aug 2007 12:09:21 -0000 1.35
+++ readline.spec 5 Nov 2007 18:26:52 -0000 1.36
@@ -1,11 +1,11 @@
Summary: A library for editing typed command lines
Name: readline
Version: 5.2
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
-Source: ftp://ftp.gnu.org/gnu/readline-%{version}.tar.gz
+Source: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz
Patch1: readline-5.2-shlib.patch
Patch2: readline-5.2-001.patch
Patch3: readline-5.2-002.patch
@@ -14,6 +14,7 @@
Patch6: readline-5.2-005.patch
Patch7: readline-5.2-006.patch
Patch8: readline-5.2-007.patch
+Patch9: readline-5.2-inv.patch
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
BuildRequires: ncurses-devel
@@ -60,11 +61,17 @@
%patch6 -p0 -b .005
%patch7 -p0 -b .006
%patch8 -p0 -b .007
+%patch9 -p1 -b .inv
-rm -f examples/rlfe/configure
+pushd examples
+rm -f rlfe/configure
+iconv -f iso8859-1 -t utf8 -o rl-fgets.c{_,}
+touch -r rl-fgets.c{,_}
+mv -f rl-fgets.c{_,}
+popd
%build
-export CPPFLAGS="-I/usr/include/ncurses"
+export CPPFLAGS="-I%{_includedir}/ncurses"
%configure
make %{?_smp_mflags}
@@ -104,14 +111,14 @@
:
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc CHANGES COPYING NEWS README USAGE
%{_libdir}/lib*.so.*
%{_infodir}/history.info*
%{_infodir}/rluserman.info*
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc examples/*.c examples/*.h examples/rlfe
%{_includedir}/readline
%{_libdir}/lib*.so
@@ -119,10 +126,15 @@
%{_infodir}/readline.info*
%files static
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_libdir}/lib*.a
%changelog
+* Mon Nov 05 2007 Miroslav Lichvar <mlichvar at redhat.com> 5.2-8
+- fix cursor position when prompt has one invisible character (#358231)
+- merge review fixes (#226361)
+- fix source URL
+
* Mon Aug 27 2007 Miroslav Lichvar <mlichvar at redhat.com> 5.2-7
- include patches 005, 006, 007
- Previous message (by thread): rpms/dovecot/F-7 dovecot-1.0.3-winbind.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 dovecot.spec, 1.81, 1.82 sources, 1.30, 1.31
- Next message (by thread): rpms/livecd-tools/F-7 isotostick.sh, NONE, 1.1 livecd-tools.spec, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list