[rpms/setup] update_services: do not export INPUTRC to respect just created ~/.inputrc (#443717)

[rpms/setup] update_services: do not export INPUTRC to respect just created ~/.inputrc (#443717)

[Ondrej Vasik]

A new commit has been pushed.

Repo   : rpms/setup
Branch : update_services
Commit : 9865258f43f56b44b45a89ef6af4a92d064a5608
Author : Ondrej Vasik <ovasik@fedoraproject.org>
Date   : 2008-12-10T16:06:00+00:00
Stats  : +46/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/setup/c/9865258f43f56b44b45a89ef6af4a92d064a5608?branch=update_services

Log:
do not export INPUTRC to respect just created ~/.inputrc (#443717)

---
diff --git a/setup-2.7.5.patch b/setup-2.7.5.patch
new file mode 100644
index 0000000..030d6be
--- /dev/null
+++ b/setup-2.7.5.patch
@@ -0,0 +1,38 @@
+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

diff --git a/setup.spec b/setup.spec
index d669d2d..567b6c2 100644
--- a/setup.spec
+++ b/setup.spec
@@ -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 @@ setup files, such as passwd, group, and profile.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 
@@ -79,6 +81,11 @@ rm -rf %{buildroot}
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Wed Dec 10 2008 Ondrej Vasik <ovasik@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@redhat.com> 2.7.5-1
 - Modified upstream URL, synchronized with upstream git