[rpms/setup] update_services: oops - fix not set path for csh shell caused by 2.8.16 update

[rpms/setup] update_services: oops - fix not set path for csh shell caused by 2.8.16 update

[Ondrej Vasik]

A new commit has been pushed.

Repo   : rpms/setup
Branch : update_services
Commit : b80d7a060530140f64c4eddcc489133a53cdbeb1
Author : Ondrej Vasik <ovasik@fedoraproject.org>
Date   : 2010-03-26T15:38:46+00:00
Stats  : +23/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/setup/c/b80d7a060530140f64c4eddcc489133a53cdbeb1?branch=update_services

Log:
oops - fix not set path for csh shell caused by 2.8.16 update

---
diff --git a/setup-cshpath.patch b/setup-cshpath.patch
new file mode 100644
index 0000000..a9851af
--- /dev/null
+++ b/setup-cshpath.patch
@@ -0,0 +1,20 @@
+diff -urNp setup-2.8.16-orig/csh.login setup-2.8.16/csh.login
+--- setup-2.8.16-orig/csh.login	2010-03-26 13:10:06.000000000 +0100
++++ setup-2.8.16/csh.login	2010-03-26 16:36:11.000000000 +0100
+@@ -2,12 +2,10 @@
+ 
+ # System wide environment and startup programs, for login setup
+ 
+-if ($?PATH) then
+-	if ( $uid == 0 ) then
+-		setenv PATH "/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin"
+-	else
+-		setenv PATH "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin"
+-	endif
++if ( $uid == 0 ) then
++	setenv PATH "/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin"
++else
++	setenv PATH "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin"
+ endif
+ 
+ setenv HOSTNAME `/bin/hostname`

diff --git a/setup.spec b/setup.spec
index 70d0cbd..cb2bff9 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,11 +1,12 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.8.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
 Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2
+Patch1: setup-cshpath.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
@@ -17,6 +18,7 @@ setup files, such as passwd, group, and profile.
 
 %prep
 %setup -q
+%patch1 -p1
 ./shadowconvert.sh
 
 %build