[freenx-server] Fix nxdialog when /usr/bin/dialog is available but xterm isn't (#627010).

[Ville Skyttä]

commit 450bbeb2f768a44f533491b5b1ce86d79987b13e
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Jun 20 00:36:23 2011 +0300

    Fix nxdialog when /usr/bin/dialog is available but xterm isn't (#627010).

 freenx-server-0.7.3-nxdialog-627010.patch |   12 ++++++++++++
 freenx-server.spec                        |    9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/freenx-server-0.7.3-nxdialog-627010.patch b/freenx-server-0.7.3-nxdialog-627010.patch
new file mode 100644
index 0000000..3a82399
--- /dev/null
+++ b/freenx-server-0.7.3-nxdialog-627010.patch
@@ -0,0 +1,12 @@
+diff -up freenx-server-0.7.3/nxdialog~ freenx-server-0.7.3/nxdialog
+--- freenx-server-0.7.3/nxdialog~	2011-06-20 00:02:55.175387849 +0300
++++ freenx-server-0.7.3/nxdialog	2011-06-20 00:20:11.551917170 +0300
+@@ -88,7 +88,7 @@ if [ -x /usr/bin/Xdialog ] 
+ then
+ 	dialog_interface="xdialog"
+ 	DIALOG=/usr/bin/Xdialog # just in case that we have no good path
+-elif [ -x /usr/bin/dialog ]
++elif [ -x /usr/bin/dialog ] && which xterm &>/dev/null
+ then
+ 	#JJK: Added 'dialog_interface=dialog' option because Xdialog not standard
+ 	#JJK: on some distros such as Fedora and xmessage won't handle long
diff --git a/freenx-server.spec b/freenx-server.spec
index 95c5a03..fad0b33 100644
--- a/freenx-server.spec
+++ b/freenx-server.spec
@@ -7,7 +7,7 @@
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx-server
 Version: 0.7.3
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
@@ -17,6 +17,7 @@ Patch0: freenx-server-0.7.3-lp-fixes.patch
 Patch1: freenx-server-r104-fixes.patch
 Patch2: restorecon.patch
 Patch3: freenx-server-0.7.3-nxpath-616993.patch
+Patch4: freenx-server-0.7.3-nxdialog-627010.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: imake, redhat-release
 Requires: nx, %{_pkglibdir}
@@ -44,6 +45,7 @@ under the GPL. FreeNX-server is a GPL implementation of the NX Server.
 %patch1 -p1 -b .fixes
 %patch2 -p0 -b .restorecon
 %patch3 -p1 -b .nxpath
+%patch4 -p1 -b .nxdialog
 
 sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
   -e's,\$NX_DIR/lib,%{_pkglibdir},g'\
@@ -129,6 +131,9 @@ fi
 %{_sysconfdir}/init.d/freenx-server
 
 %changelog
+* Mon Jun 20 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-22
+- Fix nxdialog when /usr/bin/dialog is available but xterm isn't (#627010).
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -187,7 +192,7 @@ fi
 * Mon Nov 19 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.1-1
 - Update to 0.7.1, many bugfixes, BZ 364751, 373771.
 
-* Sun Sep 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.0-2
+* Sun Sep 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.0-2
 - Do not try to set up KDE_PRINTRC if ENABLE_KDE_CUPS is not 1, deal better
   with errors when it is (#290351).