From 3de397a58d9b184fe6b4efeb97b1136b1d6f5d8f Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 15:21:37 +0000
Subject: auto-import changelog data from zsh-4.2.0-3.src.rpm

Mon Jul 05 2004 Jens Petersen <petersen@redhat.com> - 4.2.0-3
- source profile in zprofile rather than .zshrc (Péter Kelemen, Magnus
    Gustavsson, 102187,126539)
- add zsh-4.2.0-jobtable-125452.patch to fix job table bug (Henrique
    Martins, 125452)
- buildrequire tetex for texi2html (Maxim Dzumanenko, 124182)

---

diff --git a/dotzshrc b/dotzshrc
index 1ff4327..9935bec 100644
--- a/dotzshrc
+++ b/dotzshrc
@@ -4,11 +4,6 @@
 # functions, options, key bindings, etc.
 #
 
-# source profile like .bashrc
-if [ -f /etc/profile ]; then
-	source /etc/profile
-fi
-
 autoload -U compinit
 compinit
 
diff --git a/zprofile.rhs b/zprofile.rhs
index 177f478..6eaf26d 100644
--- a/zprofile.rhs
+++ b/zprofile.rhs
@@ -4,3 +4,8 @@
 
 PATH="$PATH:$HOME/bin"
 export PATH
+
+# source profile
+if [ -f /etc/profile ]; then
+	source /etc/profile
+fi
diff --git a/zsh.spec b/zsh.spec
index 6dd849e..d17ed75 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.2.0
-Release: 2
+Release: 3
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -17,11 +17,12 @@ Source6: dotzshrc
 Source7: zshprompt.pl
 Patch0: zsh-serial.patch
 Patch1: zsh-4.0.6-make-test-fail.patch
+Patch2: zsh-4.2.0-jobtable-125452.patch
 #Patch3: zsh-4.0.7-bckgrnd-bld-102042.patch
 Prereq: fileutils grep /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: libcap
-BuildRequires: libtermcap-devel libcap-devel texinfo
+BuildRequires: libtermcap-devel libcap-devel texinfo tetex
 
 %{?_without_check: %define _without_check 1}
 %{!?_without_check: %define _without_check 0}
@@ -53,6 +54,7 @@ This package contains the Zsh manual in html format.
 %setup -q
 %patch0 -p1 -b .serial
 %patch1 -p1 -b .fail
+%patch2 -p0 -b .jobtbl
 #%%patch3 -p0 -b .bckgrnd
 ## patch3 touches zshconfig.ac
 #autoconf
@@ -140,6 +142,13 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Mon Jul  5 2004 Jens Petersen <petersen@redhat.com> - 4.2.0-3
+- source profile in zprofile rather than .zshrc (Péter Kelemen,
+  Magnus Gustavsson, 102187,126539)
+- add zsh-4.2.0-jobtable-125452.patch to fix job table bug
+  (Henrique Martins, 125452)
+- buildrequire tetex for texi2html (Maxim Dzumanenko, 124182)
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/zshrc.rhs b/zshrc.rhs
index f0f35a4..b50aece 100644
--- a/zshrc.rhs
+++ b/zshrc.rhs
@@ -14,3 +14,13 @@ PROMPT='[%n@%m]%~%# '    # default prompt
 # bindkey -v             # vi key bindings
 # 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
+    for i in /etc/profile.d/*.sh; do
+	if [ -r "$i" ]; then
+	    . $i
+	fi
+    done
+    unset i
+fi