nx-libs.spec: Handle fonts dir symlinking and install /usr/share/nx/fonts…

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.

nx-libs.spec: Handle fonts dir symlinking and install /usr/share/nx/fonts…
7bf44462 · Mike Gabriel · Mihai Moldovan · bd98ba2d · 7bf44462
Commit 7bf44462 authored Feb 08, 2017 by Mike Gabriel Committed by Mihai Moldovan Mar 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

nx-libs.spec nx-libs.spec +11 -2

No files found.
--- 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)