From 83b6adbf2ce83d5d031a9423cc32ff2b8d75cac6 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 15:19:18 +0000 Subject: auto-import changelog data from zsh-4.0.2-1.src.rpm Tue Jun 26 2001 Trond Eivind Glomsr�d - 4.0.2 - Run the testsuite during build Wed Jun 20 2001 Trond Eivind Glomsr�d - Add libtermcap-devel and libcap-devel to buildrequires Fri Jun 01 2001 Trond Eivind Glomsr�d - 4.0.1 Thu May 17 2001 Trond Eivind Glomsr�d - 4.0.1pre4 - zsh is now available in bz2 - use it Mon Apr 09 2001 Trond Eivind Glomsr�d - 4.0.1pre3 - remove the dir file from the info directory Wed Mar 21 2001 Trond Eivind Glomsr�d - Remove contents from /etc/zshenv file - no reason to duplicate things from /etc/profile, which is sourced from /etc/zprofile (#32478) Thu Mar 15 2001 Trond Eivind Glomsr�d - 4.0.1pre2 - remove some obsolete code in /etc/zprofile --- diff --git a/.cvsignore b/.cvsignore index 666d7ed..bb2ae59 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zsh-3.0.8.tar.gz +zsh-4.0.2.tar.bz2 diff --git a/sources b/sources index 51468d6..173fff8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c4c62da23d2b9d8d7599768193cc782 zsh-3.0.8.tar.gz +11cfcd3ff0b53ced5b99cc7bd3dd7235 zsh-4.0.2.tar.bz2 diff --git a/zprofile.rhs b/zprofile.rhs index 679ea75..0bd6d3a 100644 --- a/zprofile.rhs +++ b/zprofile.rhs @@ -2,19 +2,6 @@ # /etc/zprofile and ~/.zprofile are run for login shells # -# # all bourne shells should source /etc/profile source /etc/profile -# -# run other components -- zsh is a bourne shell -#for i in /etc/profile.d/*.sh -#do -# source $i -#done -# -#if [ `id -gn` = `id -un` -a `id -u` -gt 14 ]; then -# umask 002 -#else -# umask 022 -#fi diff --git a/zsh.spec b/zsh.spec index c644fa0..9ce202a 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,20 +1,19 @@ Summary: A shell similar to ksh, but with improvements. Name: zsh -Version: 3.0.8 -Release: 8 -Copyright: GPL +Version: 4.0.2 +Release: 1 +License: BSD Group: System Environment/Shells -Source0: ftp://ftp.zsh.org/pub/zsh-%{version}.tar.gz +Source0: ftp://ftp.zsh.org/pub/zsh-%{version}.tar.bz2 Source1: zlogin.rhs Source2: zlogout.rhs Source3: zprofile.rhs Source4: zshrc.rhs Source5: zshenv.rhs -Patch0: zsh-3.0.8-doc.patch -Patch1: zsh-3.0.8-nousrlocal.patch -Patch2: zsh-3.0.4-rlimitlock.path Prereq: fileutils grep /sbin/install-info Buildroot: %{_tmppath}/%{name}-%{version}-root +Requires: libcap +BuildRequires: libtermcap-devel libcap-devel %description The zsh shell is a command interpreter usable as an interactive login @@ -29,9 +28,6 @@ Install the zsh package if you'd like to try out a different shell. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build @@ -40,18 +36,20 @@ autoconf # gawk exits 1 on ia64 for no apparent reason make || make +# Run the testsuite +make test %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc -%makeinstall install.man install.info bindir=$RPM_BUILD_ROOT/bin - -gzip -9 $RPM_BUILD_ROOT/%{_infodir}/* +%makeinstall install.info bindir=$RPM_BUILD_ROOT/bin \ + fndir=$RPM_BUILD_ROOT/%{_datadir}/zsh/%{version}/functions \ + sitefndir=$RPM_BUILD_ROOT/%{_datadir}/zsh/site-functions chmod 755 ${RPM_BUILD_ROOT}/bin/zsh +rm -f $RPM_BUILD_ROOT/%{_infodir}/dir -cp Etc/{BUGS,FAQ,CONTRIBUTORS,FEATURES,NEWS} . for I in zshrc zlogin zlogout zshenv zprofile; do cp $RPM_SOURCE_DIR/${I}.rhs ${RPM_BUILD_ROOT}/etc/$I @@ -89,15 +87,42 @@ fi %files %defattr(-,root,root) -%doc BUGS CONTRIBUTORS ChangeLog FAQ FEATURES META-FAQ NEWS README -%doc Etc Util Functions -/bin/zsh -/bin/zsh-%{version} +%doc README LICENCE Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ Etc/FEATURES Etc/MACHINES +%doc Etc/NEWS Etc/zsh-development-guide Etc/completion-style-guide +/bin/zsh* %{_mandir}/*/* %{_infodir}/* +%{_datadir}/zsh +/usr/lib/zsh %config(noreplace) /etc/* %changelog +* Tue Jun 26 2001 Trond Eivind Glomsr�d +- 4.0.2 +- Run the testsuite during build + +* Wed Jun 20 2001 Trond Eivind Glomsr�d +- Add libtermcap-devel and libcap-devel to buildrequires + +* Fri Jun 1 2001 Trond Eivind Glomsr�d +- 4.0.1 + +* Thu May 17 2001 Trond Eivind Glomsr�d +- 4.0.1pre4 +- zsh is now available in bz2 - use it + +* Mon Apr 9 2001 Trond Eivind Glomsr�d +- 4.0.1pre3 +- remove the dir file from the info directory + +* Wed Mar 21 2001 Trond Eivind Glomsr�d +- Remove contents from /etc/zshenv file - no reason to duplicate things + from /etc/profile, which is sourced from /etc/zprofile (#32478) + +* Thu Mar 15 2001 Trond Eivind Glomsr�d +- 4.0.1pre2 +- remove some obsolete code in /etc/zprofile + * Tue Feb 27 2001 Preston Brown - noreplace config files. diff --git a/zshenv.rhs b/zshenv.rhs index fca7e72..05b2793 100644 --- a/zshenv.rhs +++ b/zshenv.rhs @@ -6,14 +6,3 @@ # .zshenv should not contain commands that product # output or assume the shell is attached to a tty. # - -export X11HOME=/usr/X11R6 - -if [ `id -u` -eq 0 ]; then - path=(/sbin /usr/sbin) -fi - -echo $PATH | /bin/grep -q "\W$X11HOME/bin:" || path=($path $X11HOME/bin) -echo $PATH | /bin/grep -q "\W/bin:" || path=($path /bin) -echo $PATH | /bin/grep -q "\W/usr/bin:" || path=($path /usr/bin) -echo $PATH | /bin/grep -q "\W/usr/local/bin:" || path=($path /usr/local/bin) diff --git a/zshrc.rhs b/zshrc.rhs index f422ba7..b6ce50b 100644 --- a/zshrc.rhs +++ b/zshrc.rhs @@ -23,5 +23,5 @@ export MAIL=/var/spool/mail/$USER path=($path $HOME/bin) # bindkey -v # vi key bindings -# bindkey -e # emacs key bindings +bindkey -e # emacs key bindings bindkey ' ' magic-space # also do history expansino on space