rpms/nedit/devel nedit-5.5-nocsh.patch, NONE, 1.1 nedit.spec, 1.13, 1.14

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/nedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15382

Modified Files:
	nedit.spec 
Added Files:
	nedit-5.5-nocsh.patch 
Log Message:
don't use /bin/csh but /bin/sh as default shell (#355441)


nedit-5.5-nocsh.patch:

--- NEW FILE nedit-5.5-nocsh.patch ---
diff -up nedit-5.5/source/preferences.c.nocsh nedit-5.5/source/preferences.c
--- nedit-5.5/source/preferences.c.nocsh	2004-08-20 21:33:20.000000000 +0200
+++ nedit-5.5/source/preferences.c	2007-10-29 13:07:26.000000000 +0100
@@ -926,11 +926,7 @@ static PrefDescripRec PrefDescrip[] = {
         (void *)sizeof(PrefData.tooltipBgColor), False},
                 
     {"shell", "Shell", PREF_STRING,
-#if defined(__MVS__) || defined(__EMX__)
     	"/bin/sh",
-#else
-        "/bin/csh",
-#endif
     	PrefData.shell, (void *)sizeof(PrefData.shell), False},
     {"geometry", "Geometry", PREF_STRING, "",
     	PrefData.geometry, (void *)sizeof(PrefData.geometry), False},


Index: nedit.spec
===================================================================
RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nedit.spec	26 Oct 2007 13:50:12 -0000	1.13
+++ nedit.spec	29 Oct 2007 12:20:17 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A GUI text editor for systems with X
 Name: nedit
 Version: 5.5
-Release: 13%{?dist}
+Release: 14%{?dist}
 Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2
 Source1: nedit.desktop
 Source2: nedit-icon.png
@@ -12,6 +12,7 @@
 Patch4: nedit-5.5-varfix.patch
 Patch5: nedit-5.5-nc-manfix.patch
 Patch6: nedit-5.5-visfix.patch
+Patch7: nedit-5.5-nocsh.patch
 URL: http://nedit.org
 License: GPLv2
 Group: Applications/Editors
@@ -34,6 +35,7 @@
 %patch4 -p1 -b .varfix
 %patch5 -p1 -b .nc-manfix
 %patch6 -p1 -b .visfix
+%patch7 -p1 -b .nocsh
 
 %build
 make linux LIB=%{_lib} << EOF
@@ -74,6 +76,9 @@
 %{_datadir}/pixmaps/nedit-icon.png
 
 %changelog
+* Mon Oct 29 2007 Jindrich Novy <jnovy at redhat.com> 5.5-14
+- don't use /bin/csh but /bin/sh as default shell (#355441)
+
 * Fri Oct 26 2007 Jindrich Novy <jnovy at redhat.com> 5.5-13
 - spec cleanup