rpms/freenx/F-7 freenx-0.7.0-kdeprintrc-290351.patch, NONE, 1.1 freenx.spec, 1.7, 1.8

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/freenx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10254

Modified Files:
	freenx.spec 
Added Files:
	freenx-0.7.0-kdeprintrc-290351.patch 
Log Message:
* 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).


freenx-0.7.0-kdeprintrc-290351.patch:

--- NEW FILE freenx-0.7.0-kdeprintrc-290351.patch ---
--- nxloadconfig~	2007-07-07 08:59:03.000000000 +0300
+++ nxloadconfig	2007-09-23 11:28:40.000000000 +0300
@@ -281,9 +281,11 @@
 	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
 fi 
 
+if [ "$ENABLE_KDE_CUPS" = "1" ] ; then
 [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
-[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(kde-config --localprefix)"/share/config/kdeprintrc"
+[ -z "$KDE_PRINTRC" ] && which kde-config &>/dev/null && KDE_PRINTRC=$(kde-config --localprefix 2>/dev/null)"/share/config/kdeprintrc"
 [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
+fi
 
 #########################################################################
 # Support for --check


Index: freenx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freenx/F-7/freenx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freenx.spec	7 Sep 2007 11:38:37 -0000	1.7
+++ freenx.spec	23 Sep 2007 08:41:22 -0000	1.8
@@ -5,12 +5,13 @@
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx
 Version: 0.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
 Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
 Patch0: freenx-0.6.0-libs.patch
+Patch1: freenx-0.7.0-kdeprintrc-290351.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: openssh-server nc expect nx xorg-x11-server-Xorg xorg-x11-apps perl
 
@@ -23,6 +24,7 @@
 %prep
 %setup -q
 %patch0 -p4 -b .libs
+%patch1 -p0 -b .kdeprintrc
 sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
   -e's,\$NX_DIR/lib,%{_pkglibdir},g'\
   nxloadconfig nxserver
@@ -91,6 +93,10 @@
 /var/log/nx
 
 %changelog
+* 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).
+
 * Thu Sep 6 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1
 - CM = Christian Mandery mail at chrismandery.de,  BZ 252976
 - Version bump to 0.7.0 upstream release (CM)