- Fix build for F8, don't leave references to RPM_BUILD_ROOT in the
encodings output. (#251058)
This commit is contained in:
parent
5c48a3b1da
commit
dd3f090902
@ -26,7 +26,7 @@
|
||||
Summary: X.Org X11 fonts
|
||||
Name: xorg-x11-fonts
|
||||
Version: 7.2
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: Various licenses
|
||||
Group: User Interface/X
|
||||
URL: http://www.x.org
|
||||
@ -96,7 +96,7 @@ BuildRequires: ucs2any, bdftruncate, bdftopcf
|
||||
BuildRequires: perl
|
||||
|
||||
Conflicts: xorg-x11-server-Xorg < 1.3.0.0-10
|
||||
Conflicts: xorg-x11-server-Xnext < 1.3.0.0-10
|
||||
Conflicts: xorg-x11-server-Xnest < 1.3.0.0-10
|
||||
Conflicts: xorg-x11-server-Xdmx < 1.3.0.0-10
|
||||
Conflicts: xorg-x11-server-Xvfb < 1.3.0.0-10
|
||||
Conflicts: xorg-x11-server-Xephyr < 1.3.0.0-10
|
||||
@ -401,8 +401,8 @@ done
|
||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173875
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=6028
|
||||
{
|
||||
ENCODINGSDIR=$RPM_BUILD_ROOT%{_datadir}/X11/fonts/encodings
|
||||
pushd "${ENCODINGSDIR}" &> /dev/null
|
||||
ENCODINGSDIR=%{_datadir}/X11/fonts/encodings
|
||||
pushd "$RPM_BUILD_ROOT${ENCODINGSDIR}" &> /dev/null
|
||||
mkfontscale -n -e "${ENCODINGSDIR}" -e "${ENCODINGSDIR}/large"
|
||||
popd &> /dev/null
|
||||
}
|
||||
@ -1287,6 +1287,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
|
||||
|
||||
%changelog
|
||||
* Mon Aug 27 2007 Adam Jackson <ajax@redhat.com> 7.2-3
|
||||
- Fix build for F8, don't leave references to RPM_BUILD_ROOT in the
|
||||
encodings output. (#251058)
|
||||
|
||||
* Fri Jul 06 2007 Florian La Roche <laroche@redhat.com> - 7.2-2
|
||||
- add fontconfig dep foer misc post/postun
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user