rpms/xorg-x11-fonts/devel xorg-x11-fonts.spec,1.23,1.24

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8728

Modified Files:
	xorg-x11-fonts.spec 
Log Message:
* Mon Aug 27 2007 Adam Jackson <ajax at redhat.com> 7.2-3
- Fix build for F8, don't leave references to RPM_BUILD_ROOT in the
  encodings output. (#251058)



Index: xorg-x11-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-fonts.spec	27 Aug 2007 19:55:07 -0000	1.23
+++ xorg-x11-fonts.spec	27 Aug 2007 20:36:31 -0000	1.24
@@ -401,10 +401,12 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173875
 # https://bugs.freedesktop.org/show_bug.cgi?id=6028
 {
-  ENCODINGSDIR=%{_datadir}/X11/fonts/encodings
-  pushd "$RPM_BUILD_ROOT${ENCODINGSDIR}" &> /dev/null
-  mkfontscale -n -e "${ENCODINGSDIR}" -e "${ENCODINGSDIR}/large"
-  popd &> /dev/null
+    ENCODINGSDIR=$RPM_BUILD_ROOT%{_datadir}/X11/fonts/encodings
+    pushd "${ENCODINGSDIR}" &> /dev/null
+    mkfontscale -n -e "${ENCODINGSDIR}" -e "${ENCODINGSDIR}/large"
+    sed -i "s@$RPM_BUILD_ROOT@@" encodings.dir
+    sed -i "s@$RPM_BUILD_ROOT@@" large/encodings.dir
+    popd &> /dev/null
 }