[freenx-server] Fix default CUPS config dir on Fedora and EL-6+.
Ville Skyttä
scop at fedoraproject.org
Wed Aug 17 18:54:20 UTC 2011
commit 27938b0a182179cc8e04bde9809cb5d2412d6f77
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Wed Aug 17 10:37:05 2011 +0300
Fix default CUPS config dir on Fedora and EL-6+.
freenx-server.spec | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/freenx-server.spec b/freenx-server.spec
index 3b7c4a7..f5f33db 100644
--- a/freenx-server.spec
+++ b/freenx-server.spec
@@ -4,6 +4,12 @@
%global _pkgdatadir %{_datadir}/nx
%global _pkglibexecdir %{_libexecdir}/nx
+%if 0%{?fedora} || 0%{?rhel} > 5
+%global cupsetcdir %{_datadir}/cups/mime
+%else
+%global cupsetcdir %{_sysconfdir}/cups
+%endif
+
Summary: Free Software (GPL) Implementation of the NX Server
Name: freenx-server
Version: 0.7.3
@@ -52,8 +58,9 @@ under the GPL. FreeNX-server is a GPL implementation of the NX Server.
sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
-e's,\$NX_DIR/lib,%{_pkglibdir},g'\
nxloadconfig nxserver
-sed -i -e's,^NX_LOGFILE=.*,NX_LOGFILE=/var/log/nx/nxserver.log,' \
- nxloadconfig
+sed -i -e's,NX_LOGFILE=/.*,NX_LOGFILE=/var/log/nx/nxserver.log,' \
+ -e's,/etc/cups,%{cupsetcdir},' \
+ nxloadconfig node.conf.sample
%build
export CFLAGS="%{optflags}" MODULE_CFLAGS="%{optflags}"
@@ -134,6 +141,7 @@ fi
%changelog
* Wed Aug 17 2011 Ville Skyttä <ville.skytta at iki.fi>
+- Fix default CUPS config dir on Fedora and EL-6+.
- Build everything with %%{optflags}.
- Use %%global instead of %%define.
More information about the scm-commits
mailing list