rpms/zsh/devel zsh.spec,1.37,1.38 zshrc.rhs,1.9,1.10

[James Antill (james)]

Author: james

Update of /cvs/pkgs/rpms/zsh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28837

Modified Files:
	zsh.spec zshrc.rhs 
Log Message:
* Thu Oct 11 2007 James Antill <jantill at redhat.com> - 4.3.4-4
- Fix login shell detection.
- Resolves: 244684



Index: zsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zsh/devel/zsh.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- zsh.spec	29 Aug 2007 14:05:35 -0000	1.37
+++ zsh.spec	11 Oct 2007 14:04:00 -0000	1.38
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.3.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -150,6 +150,10 @@
 %doc Doc/*.html
 
 %changelog
+* Thu Oct 11 2007 James Antill <jantill at redhat.com> - 4.3.4-4
+- Fix login shell detection.
+- Resolves: 244684
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4.3.4-3
 - BuildRequire gawk.
 


Index: zshrc.rhs
===================================================================
RCS file: /cvs/pkgs/rpms/zsh/devel/zshrc.rhs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zshrc.rhs	9 Sep 2004 15:21:37 -0000	1.9
+++ zshrc.rhs	11 Oct 2007 14:04:00 -0000	1.10
@@ -15,8 +15,8 @@
 # bindkey -e             # emacs key bindings
 bindkey ' ' magic-space  # also do history expansion on space
 
-# from bashrc
-if [ "x$SHLVL" != "x1" ]; then # We're not a login shell
+# from bashrc, with zsh fixes
+if [[ ! -o login ]]; then # We're not a login shell
     for i in /etc/profile.d/*.sh; do
 	if [ -r "$i" ]; then
 	    . $i