diff --git a/.cvsignore b/.cvsignore index 0c19d88..68f0275 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -bash-2.05.tar.gz -bash-doc-2.05.tar.gz +bash-2.05.tar.bz2 +bash-doc-2.05.tar.bz2 diff --git a/bash.spec b/bash.spec index 8701273..a48d05f 100644 --- a/bash.spec +++ b/bash.spec @@ -1,23 +1,34 @@ Version: 2.05 Name: bash Summary: The GNU Bourne Again shell (bash) version %{version}. -Release: 3 +Release: 7 Group: System Environment/Shells -Copyright: GPL -Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}.tar.gz -Source1: bashrc -Source2: ftp://ftp.gnu.org/gnu/bash/bash-doc-%{version}.tar.gz +License: GPL +Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}.tar.bz2 +Source2: ftp://ftp.gnu.org/gnu/bash/bash-doc-%{version}.tar.bz2 Source3: dot-bashrc Source4: dot-bash_profile Source5: dot-bash_logout +# FIXME: Source6 and 7 MUST be removed at the next base version +# update! They're fixing a bug in the current version. +Source6: y.tab.c +Source7: y.tab.h Patch0: bash-2.03-paths.patch Patch1: bash-2.02-security.patch Patch2: bash-2.04-arm.patch Patch3: bash-2.03-profile.patch +Patch4: bash-2.05-readlinefixes.patch Patch5: bash-2.04-requires.patch Patch6: bash-2.04-compat.patch Patch7: bash-2.04-shellfunc.patch -Patch10: bash-2.05-s390x-unwind.patch +Patch8: bash-2.05-ia64.patch +Patch9: bash-2.05-s390x-unwind.patch +Patch51: ftp://ftp.cwru.edu/pub/bash/bash-2.05-patches/bash205-001 +Patch52: ftp://ftp.cwru.edu/pub/bash/bash-2.05-patches/bash205-002 +Patch53: ftp://ftp.cwru.edu/pub/bash/bash-2.05-patches/bash205-003 +Patch54: ftp://ftp.cwru.edu/pub/bash/bash-2.05-patches/bash205-004 +Patch55: ftp://ftp.cwru.edu/pub/bash/bash-2.05-patches/bash205-005 +Patch56: ftp://ftp.cwru.edu/pub/bash/bash-2.05-patches/bash205-006 Prefix: %{_prefix} Requires: mktemp Provides: bash2 @@ -49,18 +60,26 @@ Again shell version %{version}. %prep %setup -q -a 2 +cp %{SOURCE6} . +cp %{SOURCE7} . %patch0 -p1 -b .paths %patch1 -p1 -b .security %patch2 -p1 -b .arm %patch3 -p1 -b .profile +%patch4 -p1 -b .readline %patch5 -p1 -b .requires %patch6 -p1 -b .compat %patch7 -p1 -b .shellfunc - -%ifarch s390x -%patch10 -p1 -b .s390x +%patch8 -p1 -b .ia64 +%ifarch s390x +%patch9 -p1 -b .s390x %endif - +%patch51 -p0 -b .pl1 +%patch52 -p0 -b .pl2 +%patch53 -p0 -b .pl3 +%patch54 -p0 -b .pl4 +%patch55 -p0 -b .pl5 +%patch56 -p0 -b .pl6 echo %{version} > _distribution echo %{release} > _patchlevel @@ -116,7 +135,6 @@ s/$/.1*/ rm -f .%{_infodir}/dir } mkdir -p $RPM_BUILD_ROOT/etc/skel -install -c -m644 $RPM_SOURCE_DIR/bashrc $RPM_BUILD_ROOT/etc/bashrc install -c -m644 $RPM_SOURCE_DIR/dot-bashrc $RPM_BUILD_ROOT/etc/skel/.bashrc install -c -m644 $RPM_SOURCE_DIR/dot-bash_profile \ $RPM_BUILD_ROOT/etc/skel/.bash_profile @@ -175,7 +193,6 @@ fi %doc examples/bashdb/ examples/functions/ examples/misc/ %doc examples/scripts.noah/ examples/scripts.v2/ examples/scripts/ %doc examples/startup-files/ -%config(noreplace) /etc/bashrc %config(noreplace) /etc/skel/.b* /bin/sh /bin/bash @@ -191,14 +208,36 @@ fi %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog -* Thu Feb 14 2002 Phil Knirsch -- Removed the unecessary chmod again as it generates a require loop +* Sun Jun 24 2001 Bernhard Rosenkraenzer 2.05-7 +- Add some bugfix patches from the maintainer + +* Mon Jun 11 2001 Florian La Roche +- added patch for s390x from + +* Wed May 23 2001 Bernhard Rosenkraenzer 2.05-5 +- Don't set BASH_ENV in .bash_profile, it causes .bashrc to be sourced + twice in interactive non-login shells. +- s/Copyright/License/ + +* Fri May 5 2001 Bernhard Rosenkraenzer 2.05-4 +- Fix tempfile creation in bashbug + +* Wed May 2 2001 Preston Brown 2.05-3 +- bashrc moved to setup package + +* Tue Apr 24 2001 Bernhard Rosenkraenzer 2.05-2 +- bash comes with its own copy of readline... Add the patches we're + applying in the readline package. -* Mon May 28 2001 Oliver Paukstadt -- added chmod 644 when generated /etc/shells +* Tue Apr 24 2001 Bernhard Rosenkraenzer 2.05-1 +- Update to 2.05 +- Change PROMPT_COMMAND in bashrc for xterms + to something less space consuming (#24159) +- Provide plugs for alternate prompt commands (#30634), but don't + default to them -* Fri May 4 2001 Oliver Paukstadt -- ported to IBM zSeries (s390x, 64 bit) +* Mon Mar 19 2001 Preston Brown +- add default aliases for 'dir' and 'df' to have human readable output * Wed Feb 28 2001 Matt Wilson - don't Prereq: /sbin/install-info! diff --git a/dot-bash_profile b/dot-bash_profile index 89e7f52..fdd06ac 100644 --- a/dot-bash_profile +++ b/dot-bash_profile @@ -8,8 +8,6 @@ fi # User specific environment and startup programs PATH=$PATH:$HOME/bin -BASH_ENV=$HOME/.bashrc -export BASH_ENV PATH +export PATH unset USERNAME - diff --git a/sources b/sources index 8c52ffe..c64a6fb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -fe40d1633203c1ca6f2a6dfc6d097c48 bash-2.05.tar.gz -9bb3026e0a7cafcf592eea8f357e9f14 bash-doc-2.05.tar.gz +2d2e4b9a20ea673ee00925dfa5c31d24 bash-2.05.tar.bz2 +6be0a817ada25a0552cb17975acad0f7 bash-doc-2.05.tar.bz2