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

[Adam Jackson (ajax)]

Author: ajax

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

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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-x11-fonts.spec	6 Jul 2007 11:47:04 -0000	1.22
+++ xorg-x11-fonts.spec	27 Aug 2007 19:55:07 -0000	1.23
@@ -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: 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 @@
 # 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 @@
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
 
 %changelog
+* 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)
+
 * Fri Jul 06 2007 Florian La Roche <laroche at redhat.com> - 7.2-2
 - add fontconfig dep foer misc post/postun