diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-27 13:11:33 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-27 13:11:33 +0100 |
| commit | 5e68c1283c297fb428a9347517ea02576bd55546 (patch) | |
| tree | f7395115b90efd6c0239d6d72c5bca49168f6380 /nx-libs.spec | |
| parent | 0a5d26d121a8420feb25bd68c8f1623edf50e0a8 (diff) | |
| parent | 3e8d98f3337a21cd9147c1ac4f27258c95bf41b0 (diff) | |
| download | nx-libs-5e68c1283c297fb428a9347517ea02576bd55546.tar.gz nx-libs-5e68c1283c297fb428a9347517ea02576bd55546.tar.bz2 nx-libs-5e68c1283c297fb428a9347517ea02576bd55546.zip | |
Merge branch 'sunweaver-pr/support-builtin-fonts' into 3.6.x
Attributes GH PR #316: https://github.com/ArcticaProject/nx-libs/pull/316
Reviewed by Mihai Moldovan <ionic@ionic.de> -- Fri, 17 Feb 2017 22:00:58 -0800
Ulrich Sibiller <uli42@gmx.de> -- Mon, 27 Feb 2017 03:11:55 -0800
Diffstat (limited to 'nx-libs.spec')
| -rw-r--r-- | nx-libs.spec | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/nx-libs.spec b/nx-libs.spec index 7e3ca4796..7e25b7e81 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -26,6 +26,10 @@ BuildRequires: gpg-offline %endif %if 0%{?suse_version} BuildRequires: fdupes + +# This is what provides /usr/share/fonts on SUSE systems... +BuildRequires: filesystem + %if 0%{?suse_version} >= 1130 BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libpng) @@ -34,7 +38,7 @@ BuildRequires: pkgconfig(pixman-1) >= 0.13.2 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xpm) -BuildRequires: pkgconfig(xfont) +BuildRequires: pkgconfig(xfont) >= 1.4.2 BuildRequires: pkgconfig(xdmcp) BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xcomposite) @@ -50,7 +54,7 @@ BuildRequires: pixman-devel >= 0.13.2 BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXext-devel BuildRequires: xorg-x11-libXpm-devel -BuildRequires: xorg-x11-libXfont-devel +BuildRequires: xorg-x11-libXfont-devel >= 1.4.2 BuildRequires: xorg-x11-libXdmcp-devel BuildRequires: xorg-x11-libXdamage-devel BuildRequires: xorg-x11-libXcomposite-devel @@ -70,7 +74,7 @@ BuildRequires: pixman-devel >= 0.13.2 BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXpm-devel -BuildRequires: libXfont-devel +BuildRequires: libXfont-devel >= 1.4.2 BuildRequires: libXdmcp-devel BuildRequires: libXdamage-devel BuildRequires: libXcomposite-devel @@ -78,6 +82,7 @@ BuildRequires: libXrandr-devel BuildRequires: libXfixes-devel BuildRequires: libXtst-devel BuildRequires: libXinerama-devel +BuildRequires: xorg-x11-font-utils %endif # For imake @@ -272,8 +277,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 +363,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 +533,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) |