From c1d51375510815d4eed137f2da5407bf3359b315 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Jul 19 2014 14:59:13 +0000
Subject: Add a /usr/share/fonts/X11 symlink to usr/share/X11/fonts (rhbz#1046341)


---

diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec
index 1505a77..4ceee54 100644
--- a/xorg-x11-font-utils.spec
+++ b/xorg-x11-font-utils.spec
@@ -6,7 +6,7 @@ Name: xorg-x11-%{pkgname}
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
 Version: 7.5
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -63,7 +63,6 @@ cd ${oldpwd}
 }
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # Install all apps
 {
     for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util; do
@@ -80,14 +79,16 @@ rm -rf $RPM_BUILD_ROOT
 	done
 }
 
+# Create /usr/share/fonts/X11 symlink to /usr/share/X11/fonts (rhbz#1046341)
+# This is necessary since various xorg apps have this path hardcoded, e.g.
+# luit uses it to find encodings
+mkdir $RPM_BUILD_ROOT%{_datadir}/fonts
+ln -s ../X11/fonts $RPM_BUILD_ROOT%{_datadir}/fonts/X11
+
 install -m 744 %{SOURCE5} ${RPM_BUILD_ROOT}%{_bindir}/xorg-x11-fonts-update-dirs
 sed -i "s:@DATADIR@:%{_datadir}:" ${RPM_BUILD_ROOT}%{_bindir}/xorg-x11-fonts-update-dirs
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc README-* COPYING-bdftopcf COPYING-[c-z]*
 %{_bindir}/bdftopcf
 %{_bindir}/bdftruncate
@@ -96,6 +97,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mkfontscale
 %{_bindir}/ucs2any
 %{_bindir}/xorg-x11-fonts-update-dirs
+%dir %{_datadir}/fonts
+%{_datadir}/fonts/X11
 %dir %{_datadir}/X11/fonts
 %dir %{_datadir}/X11/fonts/util
 %{_datadir}/X11/fonts/util/map-*
@@ -109,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ucs2any.1*
 
 %changelog
+* Sat Jul 19 2014 Hans de Goede <hdegoede@redhat.com> - 1:7.5-20
+- Add a /usr/share/fonts/X11 symlink to usr/share/X11/fonts (rhbz#1046341)
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:7.5-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild