ABF is currently being migrated to new servers. Pull requests should be working.
avatar
Rosa has added b038fccb03
initial: add from SRPM
... ... --- /dev/null
... ... +++ b/.abf.yml
... ... @@ -0,0 +1,2 @@
1
sources:
2
  "readline-6.2.tar.gz": a9761cd9c3da485eb354175fcc2fe35856bc43ac
view file @ b038fccb03
... ... --- /dev/null
... ... +++ b/readline-4.1-outdated.patch
... ... @@ -0,0 +1,10 @@
1
--- readline-4.1/doc/readline.3.outdated	Tue Jan 30 15:48:32 2001
2
+++ readline-4.1/doc/readline.3	Tue Jan 30 15:51:52 2001
3
@@ -1203,3 +1204,7 @@
4
 .SH BUGS
5
 .PP
6
 It's too big and too slow.
7
+.PP
8
+The info file is much more up-to-date.  This man page conflicts with it in
9
+a few places, but the conflicts will be resolved in a future release of
10
+readline.
view file @ b038fccb03
... ... --- /dev/null
... ... +++ b/readline-4.3-no_rpath.patch
... ... @@ -0,0 +1,11 @@
1
--- readline-4.3/support/shobj-conf.no_rpath	2002-04-17 19:27:46.000000000 +0200
2
+++ readline-4.3/support/shobj-conf	2003-11-28 14:48:22.000000000 +0100
3
@@ -102,7 +102,7 @@
4
 	SHOBJ_LD='${CC}'
5
 	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
6
 
7
-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
8
+	SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
9
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
10
 	;;
11
 
view file @ b038fccb03
... ... --- /dev/null
... ... +++ b/readline-6.0-fix-shared-libs-perms.patch
... ... @@ -0,0 +1,12 @@
1
diff -Naur readline-6.0/support/shlib-install readline-6.0-fix-shared-libs-perms/support/shlib-install
2
--- readline-6.0/support/shlib-install	2008-07-19 19:16:05.000000000 -0400
3
+++ readline-6.0-fix-shared-libs-perms/support/shlib-install	2009-02-24 04:47:40.000000000 -0500
4
@@ -71,7 +71,7 @@
5
 case "$host_os" in
6
 hpux*|darwin*|macosx*|linux*)
7
 	if [ -z "$uninstall" ]; then
8
-		chmod 555 ${INSTALLDIR}/${LIBNAME}
9
+		chmod 755 ${INSTALLDIR}/${LIBNAME}
10
 	fi ;;
11
 cygwin*|mingw*)
12
 	IMPLIBNAME=`echo ${LIBNAME} \
view file @ b038fccb03
... ... --- /dev/null
... ... +++ b/readline.spec
... ... @@ -0,0 +1,291 @@
1
%define major 6
2
%define lib_name_orig lib%{name}
3
%define libname %mklibname %{name} %{major}
4
%define develname %mklibname %{name} -d
5
6
Summary:	Library for reading lines from a terminal
7
Name:		readline
8
Version:	6.2
9
Release:	%mkrel 2
10
License:	GPLv2+
11
Group:		System/Libraries
12
Url:		http://tiswww.case.edu/php/chet/readline/rltop.html
13
Source0:	ftp://ftp.gnu.org/gnu/readline/%{name}-%{version}.tar.gz
14
Source1:	ftp://ftp.gnu.org/gnu/readline/%{name}-%{version}.tar.gz.sig
15
Patch0:		readline-4.3-no_rpath.patch
16
Patch3:		readline-4.1-outdated.patch
17
Patch4:		rl-header.patch
18
Patch5:		rl-attribute.patch
19
Patch6:		readline-6.0-fix-shared-libs-perms.patch
20
Patch7:		readline62-001
21
BuildRequires:	libncurses-devel
22
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
23
24
%description
25
The "readline" library will read a line from the terminal and return it,
26
allowing the user to edit the line with the standard emacs editing keys.
27
It allows the programmer to give the user an easier-to-use and more
28
intuitive interface.
29
30
%package -n %{libname}
31
Summary:	Shared libraries for readline
32
Group:		System/Libraries
33
Obsoletes:	%{name}
34
Provides:	%{name} = %{version}-%{release}
35
36
%description -n	%{libname}
37
This package contains the library needed to run programs dynamically
38
linked to readline.
39
40
%package doc
41
Summary:	Readline documentation in GNU info format
42
Group:		Books/Computer books
43
Provides:	%{name}-doc = %{version}-%{release}
44
Requires:	%{libname} = %{version}-%{release}
45
Obsoletes:	%{libname}-doc
46
47
%description doc
48
This package contains readline documentation in the GNU info format.
49
50
%package -n %{develname}
51
Summary:	Files for developing programs that use the readline library
52
Group:		Development/C
53
Requires:	%{libname} = %{version}-%{release}
54
Obsoletes:	%{name}-devel < 6.0-2
55
Provides:	%{lib_name_orig}-devel = %{version}-%{release}
56
Provides:	%{name}-devel = %{version}-%{release}
57
Requires:	libncurses-devel 
58
Obsoletes:	%{mklibname readline 5 -d}
59
60
%description -n	%{develname}
61
The "readline" library will read a line from the terminal and return it,
62
using prompt as a prompt.  If prompt is null, no prompt is issued.  The
63
line returned is allocated with malloc(3), so the caller must free it when
64
finished.  The line returned has the final newline removed, so only the
65
text of the line remains.
66
67
%prep
68
%setup -q
69
%patch0 -p1 -b .no_rpath
70
%patch3 -p1 -b .outdated
71
%patch4 -p1 -b .header
72
%patch5 -p1 -b .attribute
73
%patch6 -p1 -b .fix-perms
74
%patch7 -p0 -b .001
75
76
libtoolize --copy --force
77
78
%build
79
export LDFLAGS="-I%{_includedir}/ncurses -lncurses"
80
export CFLAGS="%{optflags} -I%{_includedir}/ncurses -lncurses"
81
export CXXFLAGS="%{optflags} -I%{_includedir}/ncurses -lncurses"
82
83
%configure2_5x \
84
	 --with-curses \
85
	 --enable-multibyte
86
87
perl -p -i -e 's|-Wl,-rpath.*||' shlib/Makefile
88
89
%make
90
91
%install
92
rm -rf %{buildroot}
93
%makeinstall_std
94
95
# put all libs in /lib because some package needs it
96
# before /usr is mounted
97
install -d %{buildroot}/%{_lib}
98
mv %{buildroot}%{_libdir}/*.so* %{buildroot}/%{_lib}
99
ln -s ../../%{_lib}/lib{history,readline}.so %{buildroot}%{_libdir}
100
101
# The make install moves the existing libs with a suffix of old. Urgh.
102
rm -f %{buildroot}/%{_lib}/*.old
103
104
perl -p -i -e 's|/usr/local/bin/perl|/usr/bin/perl|' doc/texi2html
105
106
%clean
107
rm -rf %{buildroot}
108
109
%if %mdkversion < 200900
110
%post -n %{libname} -p /sbin/ldconfig
111
%endif
112
%if %mdkversion < 200900
113
%postun -n %{libname} -p /sbin/ldconfig
114
%endif
115
116
%post doc
117
%{_install_info history.info}
118
%{_install_info readline.info}
119
120
%preun doc
121
%{_remove_install_info history.info}
122
%{_remove_install_info readline.info}
123
124
%files -n %{libname}
125
%defattr(-,root,root)
126
/%{_lib}/lib*.so.%{major}*
127
128
%files doc
129
%{_infodir}/*info*
130
131
%files -n %{develname}
132
%defattr(-,root,root)
133
%doc CHANGELOG CHANGES MANIFEST README USAGE
134
%doc doc examples support
135
%{_mandir}/man3/*
136
%{_datadir}/readline
137
%{_includedir}/readline
138
%{_libdir}/lib*.a
139
%{_libdir}/lib*.so
140
/%{_lib}/*so
141
142
143
%changelog
144
* Wed Apr 20 2011 Tomasz Pawel Gajc <tpg@mandriva.org> 6.2-2mdv2011.0
145
+ Revision: 656341
146
- Patch7: fix vi-mode commands (from upstream)
147
148
* Thu Feb 17 2011 Oden Eriksson <oeriksson@mandriva.com> 6.2-1
149
+ Revision: 638150
150
- 6.2
151
- drop upstream added patches
152
153
* Fri Dec 03 2010 Oden Eriksson <oeriksson@mandriva.com> 6.1-3mdv2011.0
154
+ Revision: 607337
155
- rebuild
156
157
* Wed Mar 31 2010 Guillaume Rousse <guillomovitch@mandriva.org> 6.1-2mdv2010.1
158
+ Revision: 530534
159
- apply 2 official patches
160
161
* Sat Jan 02 2010 Frederik Himpe <fhimpe@mandriva.org> 6.1-1mdv2010.1
162
+ Revision: 484989
163
- Update to new version 6.1
164
- Remove patches integrated upstream
165
166
* Sun Jun 28 2009 Tomasz Pawel Gajc <tpg@mandriva.org> 6.0-2mdv2010.0
167
+ Revision: 390322
168
- add three upstream patches
169
- spec file clean
170
171
* Tue Feb 24 2009 Guillaume Rousse <guillomovitch@mandriva.org> 6.0-1mdv2009.1
172
+ Revision: 344412
173
- new version
174
- drop merged patches
175
- drop undocumented readline-5.2-inv.patch
176
- new devel policy
177
- rename doc package to readline-doc
178
179
* Wed Jan 14 2009 Tomasz Pawel Gajc <tpg@mandriva.org> 5.2-11mdv2009.1
180
+ Revision: 329253
181
- enable multibyte characters
182
183
* Mon Dec 22 2008 Oden Eriksson <oeriksson@mandriva.com> 5.2-10mdv2009.1
184
+ Revision: 317557
185
- rebuild
186
187
* Thu Aug 07 2008 Thierry Vignaud <tv@mandriva.org> 5.2-9mdv2009.0
188
+ Revision: 265632
189
- rebuild early 2009.0 package (before pixel changes)
190
191
  + Pixel <pixel@mandriva.com>
192
    - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
193
194
* Wed May 28 2008 Funda Wang <fwang@mandriva.org> 5.2-8mdv2009.0
195
+ Revision: 212604
196
- add more ubuntu patches
197
- hardlink against ncurses
198
199
  + Tomasz Pawel Gajc <tpg@mandriva.org>
200
    - add requires on libncurses-devel for devel package
201
202
  + Thierry Vignaud <tv@mandriva.org>
203
    - fix no-buildroot-tag
204
205
* Mon Dec 31 2007 Tomasz Pawel Gajc <tpg@mandriva.org> 5.2-7mdv2008.1
206
+ Revision: 139706
207
- new license policy
208
- use upstream source file, add *.sig
209
- reorganize patches
210
- add ten upstream patches - mostly they fixes displaying characters under bash, more info can be found in each patch file
211
- compile against ncurses
212
- use macros
213
- make use of %%major in spec file
214
- spec file clean
215
216
  + Thierry Vignaud <tv@mandriva.org>
217
    - kill re-definition of %%buildroot on Pixel's request
218
219
* Wed Sep 19 2007 Guillaume Rousse <guillomovitch@mandriva.org> 5.2-6mdv2008.0
220
+ Revision: 90249
221
- rebuild
222
223
* Tue Sep 18 2007 Anssi Hannula <anssi@mandriva.org> 5.2-5mdv2008.0
224
+ Revision: 89540
225
- rebuild due to package loss
226
227
* Thu Jun 07 2007 Anssi Hannula <anssi@mandriva.org> 5.2-4mdv2008.0
228
+ Revision: 36197
229
- rebuild with correct optflags
230
231
  + Thierry Vignaud <tv@mandriva.org>
232
    - kill bogus patch 5 (#28432), add by Geoffrey Lee in 4.1-15mdk on behalf of
233
      <mlord@pobox.com>, with no explanation
234
235
* Mon May 28 2007 Ademar de Souza Reis Jr <ademar@mandriva.com.br> 5.2-2mdv2008.0
236
+ Revision: 32180
237
+ rebuild (emptylog)
238
239
* Mon May 28 2007 Ademar de Souza Reis Jr <ademar@mandriva.com.br> 5.2-1mdv2008.0
240
+ Revision: 32035
241
- introduce readline-doc package, with info documentation. The
242
  manuals were on the -devel package, but they're of general use.
243
244
245
* Thu Feb 01 2007 Emmanuel Andry <eandry@mandriva.org> 5.2-1mdv2007.0
246
+ Revision: 115840
247
- New version 5.2
248
- drop patches 11 and 18
249
- add upstream patch (P12)
250
251
* Sun Oct 15 2006 Oden Eriksson <oeriksson@mandriva.com> 5.1-3mdv2007.0
252
+ Revision: 64867
253
- bzip2 cleanup
254
- rebuild
255
256
* Thu Oct 12 2006 Oden Eriksson <oeriksson@mandriva.com> 5.1-2mdv2007.1
257
+ Revision: 63476
258
- bunzip patches
259
- Import readline
260
261
* Wed Jan 04 2006 Thierry Vignaud <tvignaud@mandriva.com> 5.1-1mdk
262
- new release
263
- drop patch 2 (was merged long ago but was still wrongly aplied because patch
264
  defaults to -F 2 :-( )
265
- drop patch 4 (rh patch dropped in fedora)
266
- drop patch 17 (merged upstream)
267
- drop patches 11 to 15 (upstream patches)
268
- patch 11: add official patch
269
270
* Sun Jan 01 2006 Mandriva Linux Team <http://www.mandrivaexpert.com/> 5.0-3mdk
271
- Rebuild
272
273
* Sun Jan 23 2005 Per Øyvind Karlsen <peroyvind@linux-mandrake.com> 5.0-2mdk
274
- from fedora:
275
	o Fix line-wrapping (bug #145329).
276
	o Apply "read -e" patch from bash package.
277
278
* Thu Jan 20 2005 Per Øyvind Karlsen <peroyvind@linux-mandrake.com> 5.0-1mdk
279
- 5.0
280
- bump major
281
- sync with fedora patches
282
- drop P1 (weren't applied), P100 & P101 (merged upstream)
283
- add url
284
- cosmetics
285
286
* Wed Dec 29 2004 Oden Eriksson <oeriksson@mandrakesoft.com> 4.3-9mdk
287
- revert latest "lib64 fixes"
288
289
* Wed Dec 29 2004 Oden Eriksson <oeriksson@mandrakesoft.com> 4.3-8mdk
290
- lib64 fixes
291
view file @ b038fccb03
... ... --- /dev/null
... ... +++ b/readline62-001
... ... @@ -0,0 +1,46 @@
1
			   READLINE PATCH REPORT
2
			   =====================
3
4
Readline-Release: 6.2
5
Patch-ID: readline62-001
6
7
Bug-Reported-by:	Clark J. Wang <dearvoid@gmail.com>
8
Bug-Reference-ID:	<AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD@mail.gmail.com>
9
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
10
11
Bug-Description:
12
13
The readline vi-mode `cc', `dd', and `yy' commands failed to modify the
14
entire line.
15
16
[This patch intentionally does not modify patchlevel]
17
18
Patch (apply with `patch -p0'):
19
20
*** ../readline-6.2-patched/vi_mode.c	2010-11-20 19:51:39.000000000 -0500
21
--- vi_mode.c	2011-02-17 20:24:25.000000000 -0500
22
***************
23
*** 1115,1119 ****
24
        _rl_vi_last_motion = c;
25
        RL_UNSETSTATE (RL_STATE_VIMOTION);
26
!       return (0);
27
      }
28
  #if defined (READLINE_CALLBACKS)
29
--- 1115,1119 ----
30
        _rl_vi_last_motion = c;
31
        RL_UNSETSTATE (RL_STATE_VIMOTION);
32
!       return (vidomove_dispatch (m));
33
      }
34
  #if defined (READLINE_CALLBACKS)
35
*** ../readline-6.2-patched/callback.c	2010-06-06 12:18:58.000000000 -0400
36
--- callback.c	2011-02-17 20:43:28.000000000 -0500
37
***************
38
*** 149,152 ****
39
--- 149,155 ----
40
  	  /* Should handle everything, including cleanup, numeric arguments,
41
  	     and turning off RL_STATE_VIMOTION */
42
+ 	  if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
43
+ 	    _rl_internal_char_cleanup ();
44
+ 
45
  	  return;
46
  	}
view file @ b038fccb03
... ... --- /dev/null
... ... +++ b/rl-attribute.patch
... ... @@ -0,0 +1,30 @@
1
diff -urNad readline5-5.2~/readline.h readline5-5.2/readline.h
2
--- readline5-5.2~/readline.h	2006-08-16 21:16:59.000000000 +0200
3
+++ readline5-5.2/readline.h	2006-10-28 14:03:36.000000000 +0200
4
@@ -373,7 +373,7 @@
5
 extern int rl_crlf PARAMS((void));
6
 
7
 #if defined (USE_VARARGS) && defined (PREFER_STDARG)
8
-extern int rl_message (const char *, ...)  __attribute__((__format__ (printf, 1, 2)));
9
+extern int rl_message (const char *, ...)  __rl_attribute__((__format__ (printf, 1, 2)));
10
 #else
11
 extern int rl_message ();
12
 #endif
13
diff -urNad readline5-5.2~/rlstdc.h readline5-5.2/rlstdc.h
14
--- readline5-5.2~/rlstdc.h	2003-05-30 21:08:02.000000000 +0200
15
+++ readline5-5.2/rlstdc.h	2006-10-28 14:03:36.000000000 +0200
16
@@ -36,10 +36,10 @@
17
 #  endif
18
 #endif
19
 
20
-#ifndef __attribute__
21
-#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
22
-#    define __attribute__(x)
23
-#  endif
24
+#if defined(__GNUC__) && __GNUC__ >= 2
25
+#  define __rl_attribute__(x) __attribute__(x)
26
+#else
27
+#  define __rl_attribute__(x)
28
 #endif
29
 
30
 #endif /* !_RL_STDC_H_ */
view file @ b038fccb03
... ... --- /dev/null
... ... +++ b/rl-header.patch
... ... @@ -0,0 +1,22 @@
1
diff -urNad readline5-5.2~/history.h readline5-5.2/history.h
2
--- readline5-5.2~/history.h	2003-07-31 14:38:44.000000000 +0200
3
+++ readline5-5.2/history.h	2006-10-28 14:06:20.000000000 +0200
4
@@ -32,6 +32,7 @@
5
 #  include "rlstdc.h"
6
 #  include "rltypedefs.h"
7
 #else
8
+#  include <stdio.h>
9
 #  include <readline/rlstdc.h>
10
 #  include <readline/rltypedefs.h>
11
 #endif
12
diff -urNad readline5-5.2~/readline.h readline5-5.2/readline.h
13
--- readline5-5.2~/readline.h	2006-08-16 21:16:59.000000000 +0200
14
+++ readline5-5.2/readline.h	2006-10-28 14:06:20.000000000 +0200
15
@@ -33,6 +33,7 @@
16
 #  include "keymaps.h"
17
 #  include "tilde.h"
18
 #else
19
+#  include <stdio.h>
20
 #  include <readline/rlstdc.h>
21
 #  include <readline/rltypedefs.h>
22
 #  include <readline/keymaps.h>

Comments