From d79c1566977cf1b20a196f89df75e03d2359dc8a Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 03:25:22 +0000 Subject: auto-import changelog data from bash-2.04-11tc1.src.rpm Sun Dec 10 2000 Chih-Wei Huang - add i18n patch --- diff --git a/bash.spec b/bash.spec deleted file mode 100644 index 247f1b7..0000000 --- a/bash.spec +++ /dev/null @@ -1,341 +0,0 @@ -%define OrigRelease 11 -Version: 2.04 -Name: bash -Summary: The GNU Bourne Again shell (bash) version %{version}. -Release: %{OrigRelease}j3 -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 -Source3: dot-bashrc -Source4: dot-bash_profile -Source5: dot-bash_logout -Patch0: bash-2.03-paths.patch -Patch1: bash-2.02-security.patch -Patch2: bash-2.04-arm.patch -Patch3: bash-2.03-profile.patch -Patch5: bash-2.04-requires.patch -Patch6: bash-2.04-compat.patch -Patch7: bash-2.04-shellfunc.patch -Patch8: bash-ia64.patch -Prefix: %{_prefix} -Requires: mktemp -Provides: bash2 -Obsoletes: bash2 etcskel -BuildRoot: /var/tmp/%{name}-root - -%description -The GNU Bourne Again shell (Bash) is a shell or command language -interpreter that is compatible with the Bourne shell (sh). Bash -incorporates useful features from the Korn shell (ksh) and the C shell -(csh). Most sh scripts can be run by bash without modification. This -package (bash) contains bash version %{version}, which improves POSIX -compliance over previous versions. However, many old shell scripts -will depend upon the behavior of bash 1.14, which is included in the -bash1 package. Bash is the default shell for Red Hat Linux. It is -popular and powerful, and you'll probably end up using it. - -Documentation for bash version %{version} is contained in the bash-doc -package. - -%package doc -Group: Documentation -Summary: Documentation for the GNU Bourne Again shell (bash) version %{version}. -Obsoletes: bash2-doc - -%description doc -The bash-doc package contains documentation for the GNU Bourne -Again shell version %{version}. - -%prep -%setup -q -a 2 -%patch0 -p1 -b .paths -%patch1 -p1 -b .security -%patch2 -p1 -b .arm -%patch3 -p1 -b .profile -%patch5 -p1 -b .requires -%patch6 -p1 -b .compat -%patch7 -p1 -b .shellfunc -%patch8 -p1 -b .ia64 -echo %{version} > _distribution -echo %{OrigRelease} > _patchlevel - -%build -#CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \ -# ./configure --prefix=$RPM_BUILD_ROOT/usr $RPM_ARCH-redhat-linux - -%configure -make - -%install -rm -rf $RPM_BUILD_ROOT - -%makeinstall - -# Take out irritating ^H's from the documentation -chmod u+w doc/* -for i in `ls --color=no doc/` ; \ - do cat doc/$i > $i ; \ - cat $i | perl -p -e 's/.//g' > doc/$i ; \ - rm $i ; \ - done - -# make manpages for bash builtins as per suggestion in DOC/README -cd doc -sed -e ' -/^\.SH NAME/, /\\- bash built-in commands, see \\fBbash\\fR(1)$/{ -/^\.SH NAME/d -s/^bash, // -s/\\- bash built-in commands, see \\fBbash\\fR(1)$// -s/,//g -b -} -d -' builtins.1 > man.pages -for i in echo pwd test kill; do - perl -pi -e "s,$i,,g" man.pages - perl -pi -e "s, , ,g" man.pages -done - -install -c -m 644 builtins.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/builtins.1 - -for i in `cat man.pages` ; do - echo .so man1/builtins.1 > ${RPM_BUILD_ROOT}%{_mandir}/man1/$i.1 -done - -# now turn man.pages into a filelist for the man subpackage -cat man.pages | tr -s ' ' '\n' | sed ' -1i\ -%defattr(0644,root,root,0755) -s:^:%{_mandir}/man1/: -s/$/.1*/ -' > ../man.pages - -{ cd $RPM_BUILD_ROOT - mkdir ./bin - mv ./usr/bin/bash ./bin - ln -sf bash ./bin/bash2 - ln -sf bash ./bin/sh - strip ./bin/* || : - gzip -9nf .%{_infodir}/bash.info - 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 -install -c -m644 $RPM_SOURCE_DIR/dot-bash_logout \ - $RPM_BUILD_ROOT/etc/skel/.bash_logout - -%clean -rm -rf $RPM_BUILD_ROOT - -# ***** bash doesn't use install-info. It's always listed in %{_infodir}/dir -# to prevent prereq loops - -%post - -HASBASH2="" -HASBASH="" -HASSH="" - -if [ ! -f /etc/shells ]; then - > /etc/shells -fi - -(while read line ; do - if [ $line = /bin/bash ]; then - HASBASH=1 - elif [ $line = /bin/sh ]; then - HASSH=1 - elif [ $line = /bin/bash2 ]; then - HASBASH2=1 - fi - done - - if [ -z "$HASBASH2" ]; then - echo "/bin/bash2" >> /etc/shells - fi - if [ -z "$HASBASH" ]; then - echo "/bin/bash" >> /etc/shells - fi - if [ -z "$HASSH" ]; then - echo "/bin/sh" >> /etc/shells -fi) < /etc/shells - - -%postun -if [ "$1" = 0 ]; then - # is "rm -f /etc/shells" better? - grep -v '^/bin/bash2$' < /etc/shells | \ - grep -v '^/bin/bash$' | \ - grep -v '^/bin/sh$' > /etc/shells.new - mv /etc/shells.new /etc/shells -fi - -%files -f man.pages -%defattr(-,root,root) -%doc CHANGES COMPAT NEWS NOTES CWRU/POSIX.NOTES -%doc doc/FAQ doc/INTRO doc/article.ms -%doc examples/bashdb/ examples/functions/ examples/misc/ -%doc examples/scripts.noah/ examples/scripts.v2/ examples/scripts/ -%doc examples/startup-files/ -%config /etc/bashrc -%config /etc/skel -/bin/sh -/bin/bash -/bin/bash2 -%{_infodir}/bash.info.gz -%{_mandir}/man1/bash.1* -%{_mandir}/man1/builtins.1* -%{_prefix}/bin/bashbug -%{_mandir}/man1/bashbug.1* - -%files doc -%defattr(-,root,root) -%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt - -%changelog -* Wed Sep 6 2000 ISHIKAWA Mutsumi -- move back /etc/skel/{.bash_profile,.bashrc,.bash_logout} from - etcskel package -- modify /etc/skel/.bashrc and /etc/bashrc for i18n - -* Wed Sep 6 2000 ISHIKAWA Mutsumi -- move /etc/skel/{.bash_profile,.bashrc,.bash_logout} to etcskel package - -* Tue Aug 22 2000 Matt Wilson -- fixed the summary of bash-doc to use %%{version} instead of "2.03" - -* Tue Aug 8 2000 Bill Nottingham -- 'exit' in bashrc is very bad. - -* Tue Aug 8 2000 Bernhard Rosenkraenzer -- minor bashrc fix (Bug #8518) - -* Mon Jul 17 2000 Bernhard Rosenkraenzer -- Don't use tput etc. in bashrc if /usr isn't available (Bug #14116) - -* Wed Jul 12 2000 Prospector -- automatic rebuild - -* Thu Jun 22 2000 Bill Nottingham -- fix for some IA-64 issues from Stephane Eranian - -* Thu Jun 15 2000 Bernhard Rosenkraenzer -- Fix summary and description, they had old version numbers (Bug #12092) - -* Tue Jun 6 2000 Bill Nottingham -- add /etc/skel/.bash* ; obsolete etcskel - -* Tue May 2 2000 Bill Nottingham -- fix for shell functions on 64-bit architectures... - -* Wed Mar 29 2000 Bernhard Rosenkraenzer -- Add some backwards compatibility (for i in ; do something; done) - -* Tue Mar 21 2000 Bernhard Rosenkraenzer -- 2.04 final -- remove the echo, pwd, test and kill man pages from the package, - we're getting them from sh-utils - -* Sun Mar 19 2000 Bernhard Rosenkraenzer -- 2.04beta5 -- adapt patches -- Fix up bashrc -- Don't put in bashrc1, this should be done by the bash1 package -- use install -c instead of plain install to work on *BSD -- remove the collected patches - they're now in the base version. -- make compressed man pages optional - -* Thu Mar 16 2000 Florian La Roche -- add some collected patches for bash2 -- change it over to be the main bash package -- install man-pages root:root -- obsolete bash2, bash2-doc - -* Wed Feb 02 2000 Cristian Gafton -- man pages are compressed -- fix description - -* Thu Dec 2 1999 Ken Estes -- updated patch to detect what executables are required by a script. - -* Fri Sep 14 1999 Dale Lovelace -- Remove annoying ^H's from documentation - -* Fri Jul 16 1999 Ken Estes -- patch to detect what executables are required by a script. - -* Sun Mar 21 1999 Cristian Gafton -- auto rebuild in the new build environment (release 4) - -* Fri Mar 19 1999 Jeff Johnson -- strip binaries. -- include bash-doc correctly. - -* Thu Mar 18 1999 Preston Brown -- fixed post/postun /etc/shells work. - -* Thu Mar 18 1999 Cristian Gafton -- updated again text in the spec file - -* Mon Feb 22 1999 Jeff Johnson -- updated text in spec file. -- update to 2.03. - -* Fri Feb 12 1999 Cristian Gafton -- build it as bash2 instead of bash - -* Tue Feb 9 1999 Bill Nottingham -- set 'NON_INTERACTIVE_LOGIN_SHELLS' so profile gets read - -* Thu Jan 14 1999 Jeff Johnson -- rename man pages in bash-doc to avoid packaging conflicts (#606). - -* Wed Dec 02 1998 Cristian Gafton -- patch for the arm -- use $RPM_ARCH-redhat-linux as the build target - -* Tue Oct 6 1998 Bill Nottingham -- rewrite %pre, axe %postun (to avoid prereq loops) - -* Wed Aug 19 1998 Jeff Johnson -- resurrect for RH 6.0. - -* Sun Jul 26 1998 Jeff Johnson -- update to 2.02.1 - -* Thu Jun 11 1998 Jeff Johnson -- Package for 5.2. - -* Mon Apr 20 1998 Ian Macdonald -- added POSIX.NOTES doc file -- some extraneous doc files removed -- minor .spec file changes - -* Sun Apr 19 1998 Ian Macdonald -- upgraded to version 2.02 -- Alpha, MIPS & Sparc patches removed due to lack of test platforms -- glibc & signal patches no longer required -- added documentation subpackage (doc) - -* Fri Nov 07 1997 Donnie Barnes -- added signal handling patch from Dean Gaudet that - is based on a change made in bash 2.0. Should fix some early exit - problems with suspends and fg. - -* Mon Oct 20 1997 Donnie Barnes -- added %clean - -* Mon Oct 20 1997 Erik Troan -- added comment explaining why install-info isn't used -- added mips patch - -* Fri Oct 17 1997 Donnie Barnes -- added BuildRoot - -* Tue Jun 03 1997 Erik Troan -- built against glibc diff --git a/dot-bashrc b/dot-bashrc index 64f0274..9271cff 100644 --- a/dot-bashrc +++ b/dot-bashrc @@ -6,8 +6,3 @@ if [ -f /etc/bashrc ]; then . /etc/bashrc fi -export EMACS_IM="canna" - -if [ "$LANG" = "ja" -o "$LANG" = "ja_JP.eucJP" ]; then - export JLESSCHARSET=japanese -fi