rpms/xorg-x11-font-utils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add a /usr/share/fonts/X11 symlink to usr/share/X11/fonts (rhbz#1046341)

Browse Source
This commit is contained in:
Hans de Goede 2014-07-19 16:59:13 +02:00
parent 703e955429
commit c1d5137551
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xorg-x11-font-utils.spec
View File

@ -6,7 +6,7 @@ Name: xorg-x11-%{pkgname}
# IMPORTANT: If package ever gets renamed to something else, remove the Epoch line! # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
Epoch: 1 Epoch: 1
Version: 7.5 Version: 7.5
Release: 19%{?dist} Release: 20%{?dist}
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -63,7 +63,6 @@ cd ${oldpwd}
} }
%install %install
rm -rf $RPM_BUILD_ROOT
# Install all apps # Install all apps
{ {
for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util; do for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util; do
@ -80,14 +79,16 @@ rm -rf $RPM_BUILD_ROOT
done 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 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 sed -i "s:@DATADIR@:%{_datadir}:" ${RPM_BUILD_ROOT}%{_bindir}/xorg-x11-fonts-update-dirs
%clean
rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-)
%doc README-* COPYING-bdftopcf COPYING-[c-z]* %doc README-* COPYING-bdftopcf COPYING-[c-z]*
%{_bindir}/bdftopcf %{_bindir}/bdftopcf
%{_bindir}/bdftruncate %{_bindir}/bdftruncate
@ -96,6 +97,8 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/mkfontscale %{_bindir}/mkfontscale
%{_bindir}/ucs2any %{_bindir}/ucs2any
%{_bindir}/xorg-x11-fonts-update-dirs %{_bindir}/xorg-x11-fonts-update-dirs
%dir %{_datadir}/fonts
%{_datadir}/fonts/X11
%dir %{_datadir}/X11/fonts %dir %{_datadir}/X11/fonts
%dir %{_datadir}/X11/fonts/util %dir %{_datadir}/X11/fonts/util
%{_datadir}/X11/fonts/util/map-* %{_datadir}/X11/fonts/util/map-*
@ -109,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/ucs2any.1* %{_mandir}/man1/ucs2any.1*
%changelog %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 * 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild