aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-08 13:57:42 +0100
committerMihai Moldovan <ionic@ionic.de>2017-03-01 15:19:18 +0100
commit7bf444621830b2ae7c2e8dcf846de5fc425b3d74 (patch)
treeb2049221eb62415715c7b2ed410199dca4100d80
parentbd98ba2d7577584e650492bbcb4ea9dd0a3aa809 (diff)
downloadnx-libs-7bf444621830b2ae7c2e8dcf846de5fc425b3d74.tar.gz
nx-libs-7bf444621830b2ae7c2e8dcf846de5fc425b3d74.tar.bz2
nx-libs-7bf444621830b2ae7c2e8dcf846de5fc425b3d74.zip
nx-libs.spec: Handle fonts dir symlinking and install /usr/share/nx/fonts symlink into nxagent bin:pkg. This change probably needs more fine-tuning for the various other RPM distros and versions out there.
Thanks to Orion Poplawski for providing a code snippet with a general approach of handling this.
-rw-r--r--nx-libs.spec13
1 files changed, 11 insertions, 2 deletions
diff --git a/nx-libs.spec b/nx-libs.spec
index 7e3ca4796..6fa4e8342 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -272,8 +272,9 @@ Obsoletes: nx < 3.5.0-19
Provides: nx = %{version}-%{release}
Provides: nx%{?_isa} = %{version}-%{release}
Obsoletes: nxauth < 3.5.99.1
-%if 0%{?suse_version}
-Requires: xorg-x11-fonts-core
+%if 0%{?fedora} || 0%{?rhel}
+# For /usr/share/X11/fonts
+Requires: xorg-x11-font-utils
%endif
%description -n nxagent
@@ -357,6 +358,13 @@ make install \
INSTALL_FILE="install -pm0644" \
INSTALL_PROGRAM="install -pm0755"
+# this needs to be adapted distribution-wise...
+%if 0%{?suse_version}
+ln -s ../fonts %{buildroot}%{_datadir}/nx/fonts
+%elif 0%{?fedora} || 0%{?rhel}
+ln -s ../X11/fonts %{buildroot}%{_datadir}/nx/fonts
+%endif
+
# Remove static libs (they don't exist on SLES, so using -f here)
rm -f %{buildroot}%{_libdir}/*.a
@@ -520,6 +528,7 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%dir %{_datadir}/nx
%{_datadir}/nx/VERSION.nxagent
%{_datadir}/man/man1/nxagent.1*
+%{_datadir}/nx/fonts
%files -n nxproxy
%defattr(-,root,root)