OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 07-Mar-2009 14:34:13
Branch: HEAD Handle: 2009030713341201
Added files:
openpkg-src/bash bash.txt
Modified files:
openpkg-src/bash bash.spec
Removed files:
openpkg-src/bash profile
Log:
revamp path configuration and provide additional configuration files
Summary:
Revision Changes Path
1.105 +30 -13 openpkg-src/bash/bash.spec
1.1 +60 -0 openpkg-src/bash/bash.txt
1.11 +0 -18 openpkg-src/bash/profile
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.spec
============================================================================
$ cvs diff -u -r1.104 -r1.105 bash.spec
--- openpkg-src/bash/bash.spec 5 Mar 2009 14:50:30 -0000 1.104
+++ openpkg-src/bash/bash.spec 7 Mar 2009 13:34:12 -0000 1.105
@@ -38,11 +38,11 @@
Group: Shell
License: GPL
Version: %{V_base_real}.%{V_plvl_raw}
-Release: 20090305
+Release: 20090307
# list of sources
Source0: ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}.tar.gz
-Source1: profile
+Source1: bash.txt
Patch0: bash.patch
# build information
@@ -77,11 +77,30 @@
# unpack and patch distribution
%setup -q -n bash-%{V_base_real}
%patch -p0
+
+ # ensure generated data is not re-generated on-the-fly
sleep 1
touch y.tab.[ch]
touch configure config.h.in
- # brand with OpenPKG release and fix patchlevel
+ # adjust paths
+ %{l_shtool} subst \
+ -e 's;^\(#define.*SYS_PROFILE[^"]*\).*;\1
"%{l_prefix}/etc/bash/profile";' \
+ pathnames.h.in
+ %{l_shtool} subst \
+ -e 's;/etc/profile;%{l_prefix}/etc/bash/profile;' \
+ doc/bash.1
+ %{l_shtool} subst \
+ -e 's;^/\* \(#define.*SYS_BASHRC[^"]*\).*;\1
"%{l_prefix}/etc/bash/bashrc";' \
+ -e 's;^/\* \(#define.*SYS_BASH_LOGOUT[^"]*\).*;\1
"%{l_prefix}/etc/bash/bash_logout";' \
+ -e
's;/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:\.;%{l_prefix}/bin:/bin:/usr/bin:%{l_prefix}/sbin:/sbin:/usr/sbin:.;'
\
+ -e
's;/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc;%{l_prefix}/bin:/bin:/usr/bin:%{l_prefix}/sbin:/sbin:/usr/sbin;'
\
+ config-top.h
+ %{l_shtool} subst \
+ -e 's;^\(#define.*SYS_INPUTRC[^"]*\).*;\1
"%{l_prefix}/etc/bash/inputrc";' \
+ lib/readline/rlconf.h
+
+ # brand with OpenPKG release
%{l_shtool} subst \
-e 's;@l_openpkg_release@;%{l_openpkg_release};' \
version.c
@@ -112,12 +131,6 @@
--without-gnu-malloc \
--without-curses \
--disable-nls
- %{l_shtool} subst \
- -e 's;^\(#define.*SYS_PROFILE["^]*\).*;\1
"%{l_prefix}/etc/bash/profile";' \
- pathnames.h
- %{l_shtool} subst \
- -e 's;/etc/profile;%{l_prefix}/etc/bash/profile;' \
- doc/bash.1
# build package
%{l_make} %{l_mflags}
@@ -133,16 +146,20 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/bashbug
strip $RPM_BUILD_ROOT%{l_prefix}/bin/bash || true
- # install global configuration
+ # install global configuration files
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/bash
- %{l_shtool} install -c -m 644 %{l_value -s -a} \
- %{SOURCE profile} $RPM_BUILD_ROOT%{l_prefix}/etc/bash/
+ for name in `grep "^<file" %{SOURCE bash.txt} | sed -e 's;^.*name=";;'
-e 's;".*$;;'`; do
+ (echo ""; cat %{SOURCE bash.txt}; echo "") |\
+ sed -e "1,/^<file name=\"$name\">/d" -e "/<\/file>/,\$d" >$name
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ $name $RPM_BUILD_ROOT%{l_prefix}/etc/bash/
+ done
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/bash/profile'
+ '%config %{l_prefix}/etc/bash/*'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.txt
============================================================================
$ cvs diff -u -r0 -r1.1 bash.txt
--- /dev/null 2009-03-07 14:34:13 +0100
+++ bash.txt 2009-03-07 14:34:13 +0100
@@ -0,0 +1,60 @@
+<file name="inputrc">
+##
+## @l_prefix@/etc/bash/inputrc -- Global GNU Bash Readline Configuration
+##
+
+# be 8-bit clean
+set input-meta on
+set output-meta on
+
+# allow the use of 8-bit characters (like the German umlauts)
+# However this makes the meta key not work as a meta key, which could
+# be annoying to those who don't need to type in 8-bit characters.
+set meta-flag on
+set convert-meta off
+
+# show all completions immediately instead of ringing the
+set show-all-if-ambiguous on
+set show-all-if-unmodified on
+
+# make SHIFT-LEFT/SHIFT-RIGHT to word-wise jump backward/forward
+"\e[1;2D": shell-backward-word
+"\e[1;2C": shell-forward-word
+
+# make CTRL-LEFT/CTRL-RIGHT to word-wise kill backward/forward
+"\e[1;5D": shell-backward-kill-word
+"\e[1;5C": shell-kill-word
+
+</file>
+<file name="profile">
+##
+## @l_prefix@/etc/bash/profile -- Global GNU Bash Profile
+##
+
+# interactive prompt and shell window size checking
+if expr $- : ".*i.*" >/dev/null; then
+ PS1='\...@\h\$ '
+ shopt -s checkwinsize
+fi
+
+# environment permissions
+umask 022
+
+# history functionality
+shopt -s histappend
+HISTSIZE=100
+HISTFILESIZE=100
+HISTIGNORE="&"
+</file>
+<file name="bashrc">
+##
+## @l_prefix@/etc/bash/bashrc -- Global GNU Bash Run-Command Script
+##
+
+</file>
+<file name="bash_logout">
+##
+## @l_prefix@/etc/bash/bash_logout -- Global GNU Bash Run-Command Script
(Logout)
+##
+
+</file>
@@ .
rm -f openpkg-src/bash/profile <<'@@ .'
Index: openpkg-src/bash/profile
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
