rpms/setup/devel setup-2.7.5.patch,NONE,1.1 setup.spec,1.63,1.64

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20517

Modified Files:
	setup.spec 
Added Files:
	setup-2.7.5.patch 
Log Message:
do not export INPUTRC to respect just created ~/.inputrc (#443717)

setup-2.7.5.patch:

--- NEW FILE setup-2.7.5.patch ---
diff -urNp setup-2.7.5-orig/csh.login setup-2.7.5/csh.login
--- setup-2.7.5-orig/csh.login	2008-11-27 13:03:16.000000000 +0100
+++ setup-2.7.5/csh.login	2008-12-10 17:00:21.000000000 +0100
@@ -17,10 +17,6 @@ endif
 setenv HOSTNAME `/bin/hostname`
 set history=1000
 
-if ( ! -f $HOME/.inputrc ) then
-	setenv INPUTRC /etc/inputrc
-endif
-
 if ( -d /etc/profile.d ) then
         set nonomatch
         foreach i ( /etc/profile.d/*.csh )
diff -urNp setup-2.7.5-orig/profile setup-2.7.5/profile
--- setup-2.7.5-orig/profile	2008-11-27 13:03:16.000000000 +0100
+++ setup-2.7.5/profile	2008-12-10 17:00:02.000000000 +0100
@@ -42,11 +42,7 @@ fi
 HOSTNAME=`/bin/hostname 2>/dev/null`
 HISTSIZE=1000
 
-if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ]; then
-    INPUTRC=/etc/inputrc
-fi
-
-export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE INPUTRC
+export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE
 
 for i in /etc/profile.d/*.sh ; do
     if [ -r "$i" ]; then
@@ -58,7 +54,5 @@ for i in /etc/profile.d/*.sh ; do
     fi
 done
 
-export PATH
-
 unset i
 unset pathmunge


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/setup.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- setup.spec	27 Nov 2008 12:16:25 -0000	1.63
+++ setup.spec	10 Dec 2008 16:06:00 -0000	1.64
@@ -1,11 +1,12 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.7.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
 Source: setup-%{version}.tar.bz2
+Patch1: setup-2.7.5.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 
@@ -79,6 +81,11 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Wed Dec 10 2008 Ondrej Vasik <ovasik at redhat.com> 2.7.5-2
+- do not export PATH twice(#449286 NOTABUG revert)
+- do not export INPUTRC(to respect just created ~/.inputrc)
+  (#443717)
+
 * Thu Nov 27 2008 Ondrej Vasik <ovasik at redhat.com> 2.7.5-1
 - Modified upstream URL, synchronized with upstream git