[freenx-server] Hush bogus NX 3.[45] incompatibility warning (Christian Ziemski, #827176).

[Ville Skyttä]

commit 3bac40b99751aee8b5304bb3acc9ab09bd859dba
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Jun 4 19:05:18 2012 +0300

    Hush bogus NX 3.[45] incompatibility warning (Christian Ziemski, #827176).

 freenx-server-0.7.3-nxagent-version-827176.patch |   14 ++++++++++++++
 freenx-server.spec                               |    7 ++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/freenx-server-0.7.3-nxagent-version-827176.patch b/freenx-server-0.7.3-nxagent-version-827176.patch
new file mode 100644
index 0000000..fba4308
--- /dev/null
+++ b/freenx-server-0.7.3-nxagent-version-827176.patch
@@ -0,0 +1,14 @@
+diff -up freenx-server-0.7.3/nxloadconfig~ freenx-server-0.7.3/nxloadconfig
+--- freenx-server-0.7.3/nxloadconfig~	2012-06-02 12:17:42.047048177 +0300
++++ freenx-server-0.7.3/nxloadconfig	2012-06-02 12:18:24.328442091 +0300
+@@ -672,8 +672,8 @@ then
+ 	[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
+ 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
+ 
+-	[ -z "$(strings $COMMAND_NXAGENT | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[0123].0')" ] && \
+-		WARNING="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[0123].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[0123].0 backend is needed for this version of FreeNX."
++	[ -z "$(strings $COMMAND_NXAGENT | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012345].0')" ] && \
++		WARNING="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[012345].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[012345].0 backend is needed for this version of FreeNX."
+ 		
+ 	[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
+ 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\""
diff --git a/freenx-server.spec b/freenx-server.spec
index 627a6c0..5c8ae28 100644
--- a/freenx-server.spec
+++ b/freenx-server.spec
@@ -19,7 +19,7 @@
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx-server
 Version: 0.7.3
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
@@ -35,6 +35,7 @@ Patch4: freenx-server-0.7.3-nxdialog-627010.patch
 Patch5: freenx-server-0.7.3-optflags.patch
 Patch6: freenx-server-0.7.3-init.patch
 Patch7: freenx-server-0.7.3-nxipp.patch
+Patch8: freenx-server-0.7.3-nxagent-version-827176.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: imake, redhat-release
 %if %{with systemd}
@@ -72,6 +73,7 @@ under the GPL. FreeNX-server is a GPL implementation of the NX Server.
 %patch5 -p1 -b .optflags
 %patch6 -p1 -b .init
 %patch7 -p1 -b .nxipp
+%patch8 -p1 -b .nxagent-version
 
 sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
   -e's,\$NX_DIR/lib,%{_pkglibdir},g'\
@@ -206,6 +208,9 @@ systemctl daemon-reload &>/dev/null || :
 /var/log/nx
 
 %changelog
+* Mon Jun  4 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-26
+- Hush bogus NX 3.[45] incompatibility warning (Christian Ziemski, #827176).
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild