Accepting request 21411 from Base:System
Copy from Base:System/bash based on submit request 21411 from user WernerFink OBS-URL: https://build.opensuse.org/request/show/21411 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=45
This commit is contained in:
commit
0a40815690
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 30 13:24:57 CEST 2009 - werner@suse.de
|
||||||
|
|
||||||
|
- Make _rl_enable_meta configurable by the users (bnc#541379)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 9 17:41:15 CEST 2009 - werner@suse.de
|
Wed Sep 9 17:41:15 CEST 2009 - werner@suse.de
|
||||||
|
|
||||||
|
17
bash.spec
17
bash.spec
@ -28,7 +28,7 @@ Recommends: bash-lang = %bash_vers
|
|||||||
Suggests: command-not-found
|
Suggests: command-not-found
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 4.0
|
Version: 4.0
|
||||||
Release: 16
|
Release: 17
|
||||||
Summary: The GNU Bourne-Again Shell
|
Summary: The GNU Bourne-Again Shell
|
||||||
Url: http://www.gnu.org/software/bash/bash.html
|
Url: http://www.gnu.org/software/bash/bash.html
|
||||||
Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2
|
Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2
|
||||||
@ -59,6 +59,7 @@ Patch20: readline-%{rl_vers}.dif
|
|||||||
Patch21: readline-4.3-input.dif
|
Patch21: readline-4.3-input.dif
|
||||||
Patch22: readline-6.0-wrap.patch
|
Patch22: readline-6.0-wrap.patch
|
||||||
Patch23: readline-5.2-conf.patch
|
Patch23: readline-5.2-conf.patch
|
||||||
|
Patch24: readline-6.0-metamode.patch
|
||||||
Patch30: readline-6.0-destdir.patch
|
Patch30: readline-6.0-destdir.patch
|
||||||
Patch40: bash-4.0.10-typo.patch
|
Patch40: bash-4.0.10-typo.patch
|
||||||
Patch42: bash-4.0.24-acl.dif
|
Patch42: bash-4.0.24-acl.dif
|
||||||
@ -90,7 +91,7 @@ Group: Documentation/Man
|
|||||||
Provides: bash:%{_infodir}/bash.info.gz
|
Provides: bash:%{_infodir}/bash.info.gz
|
||||||
PreReq: %install_info_prereq
|
PreReq: %install_info_prereq
|
||||||
Version: 4.0
|
Version: 4.0
|
||||||
Release: 16
|
Release: 17
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
|
|
||||||
%description -n bash-doc
|
%description -n bash-doc
|
||||||
@ -110,7 +111,7 @@ License: GPL v2 or later
|
|||||||
Summary: Include Files mandatory for Development of bash loadable builtins
|
Summary: Include Files mandatory for Development of bash loadable builtins
|
||||||
Group: Development/Languages/C and C++
|
Group: Development/Languages/C and C++
|
||||||
Version: 4.0
|
Version: 4.0
|
||||||
Release: 5
|
Release: 6
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
|
|
||||||
%description -n bash-devel
|
%description -n bash-devel
|
||||||
@ -130,7 +131,7 @@ License: GPL v2 or later
|
|||||||
Summary: Loadable bash builtins
|
Summary: Loadable bash builtins
|
||||||
Group: System/Shells
|
Group: System/Shells
|
||||||
Version: 4.0
|
Version: 4.0
|
||||||
Release: 5
|
Release: 6
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
|
|
||||||
%description -n bash-loadables
|
%description -n bash-loadables
|
||||||
@ -199,7 +200,7 @@ Summary: The Readline Library
|
|||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Provides: bash:/%{_lib}/libreadline.so.%{rl_major}
|
Provides: bash:/%{_lib}/libreadline.so.%{rl_major}
|
||||||
Version: 6.0
|
Version: 6.0
|
||||||
Release: 16
|
Release: 17
|
||||||
Recommends: readline-doc = %{version}
|
Recommends: readline-doc = %{version}
|
||||||
# bug437293
|
# bug437293
|
||||||
%ifarch ppc64
|
%ifarch ppc64
|
||||||
@ -228,7 +229,7 @@ Summary: Include Files and Libraries mandatory for Development
|
|||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Provides: bash:%{_libdir}/libreadline.a
|
Provides: bash:%{_libdir}/libreadline.a
|
||||||
Version: 6.0
|
Version: 6.0
|
||||||
Release: 16
|
Release: 17
|
||||||
Requires: libreadline6 = %{version}
|
Requires: libreadline6 = %{version}
|
||||||
Requires: ncurses-devel
|
Requires: ncurses-devel
|
||||||
Recommends: readline-doc = %{version}
|
Recommends: readline-doc = %{version}
|
||||||
@ -257,7 +258,7 @@ Group: System/Libraries
|
|||||||
Provides: readline:%{_infodir}/readline.info.gz
|
Provides: readline:%{_infodir}/readline.info.gz
|
||||||
PreReq: %install_info_prereq
|
PreReq: %install_info_prereq
|
||||||
Version: 6.0
|
Version: 6.0
|
||||||
Release: 16
|
Release: 17
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
|
|
||||||
%description -n readline-doc
|
%description -n readline-doc
|
||||||
@ -297,6 +298,7 @@ unset p
|
|||||||
%patch21 -p0 -b .zerotty
|
%patch21 -p0 -b .zerotty
|
||||||
%patch22 -p0 -b .wrap
|
%patch22 -p0 -b .wrap
|
||||||
%patch23 -p0 -b .conf
|
%patch23 -p0 -b .conf
|
||||||
|
%patch24 -p0 -b .metamode
|
||||||
%patch40 -p0 -b .typo
|
%patch40 -p0 -b .typo
|
||||||
%patch42 -p0 -b .acl
|
%patch42 -p0 -b .acl
|
||||||
%patch0 -p0
|
%patch0 -p0
|
||||||
@ -309,6 +311,7 @@ done
|
|||||||
%patch21 -p2 -b .zerotty
|
%patch21 -p2 -b .zerotty
|
||||||
%patch22 -p2 -b .wrap
|
%patch22 -p2 -b .wrap
|
||||||
%patch23 -p2 -b .conf
|
%patch23 -p2 -b .conf
|
||||||
|
%patch24 -p2 -b .metamode
|
||||||
%patch30 -p0 -b .destdir
|
%patch30 -p0 -b .destdir
|
||||||
%patch20 -p0
|
%patch20 -p0
|
||||||
|
|
||||||
|
11
readline-6.0-metamode.patch
Normal file
11
readline-6.0-metamode.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# See bug bnc#541379
|
||||||
|
--- lib/readline/bind.c
|
||||||
|
+++ lib/readline/bind.c 2009-09-30 11:25:38.087930034 +0200
|
||||||
|
@@ -1473,6 +1473,7 @@ static const struct {
|
||||||
|
#if defined (VISIBLE_STATS)
|
||||||
|
{ "visible-stats", &rl_visible_stats, 0 },
|
||||||
|
#endif /* VISIBLE_STATS */
|
||||||
|
+ { "meta-mode", &_rl_enable_meta, 0 },
|
||||||
|
{ (char *)NULL, (int *)NULL }
|
||||||
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user