From 0a1b9d77c9861934a50ff35829a449b039084e5e Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Fri, 26 Mar 2010 16:06:41 +0000 Subject: [PATCH] bad ugly double-thirteen friday(fix previous badfix) --- setup-cshpath.patch | 20 +++++++------------- setup.spec | 5 ++++- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/setup-cshpath.patch b/setup-cshpath.patch index a9851af..07e9658 100644 --- a/setup-cshpath.patch +++ b/setup-cshpath.patch @@ -1,20 +1,14 @@ 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 @@ ++++ setup-2.8.16/csh.login 2010-03-26 17:04:02.000000000 +0100 +@@ -2,7 +2,9 @@ # 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" ++if ( $?PATH ) then ++ #do not override user specified PATH +else -+ setenv PATH "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin" - endif - - setenv HOSTNAME `/bin/hostname` + if ( $uid == 0 ) then + setenv PATH "/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin" + else diff --git a/setup.spec b/setup.spec index 0a3b8b4..eab2cd2 100644 --- a/setup.spec +++ b/setup.spec @@ -1,7 +1,7 @@ Summary: A set of system configuration and setup files Name: setup Version: 2.8.16 -Release: 2%{?dist} +Release: 3%{?dist} License: Public Domain Group: System Environment/Base URL: https://fedorahosted.org/setup/ @@ -91,6 +91,9 @@ end %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab %changelog +* Fri Mar 26 2010 Ondrej Vasik 2.8.16-3 +- bad ugly double-thirteen friday(fix previous badfix) + * Fri Mar 26 2010 Ondrej Vasik 2.8.16-2 - fix not set path for csh shell caused by 2.8.16 update