Hello community, here is the log from the commit of package xorg-x11 checked in at Fri Jun 2 02:12:36 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-05-30 15:26:11.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-05-31 18:24:45.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 31 18:22:19 CEST 2006 - sndirsch@suse.de + +- generate /usr/X11R6/lib/X11/fonts/misc/fonts.dir on s390/s390x + during %install (Bug #178315) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.Xrty7L/_old 2006-06-02 02:10:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Xrty7L/_new 2006-06-02 02:10:48.000000000 +0200 @@ -40,7 +40,7 @@ %endif Autoreqprov: on Version: 6.9.0 -Release: 55 +Release: 56 Summary: The basic X Window System package Source: xorg-6.9.0.tar.bz2 Source1: xdm.tar.gz @@ -1725,8 +1725,13 @@ make install DESTDIR=$RPM_BUILD_ROOT make install.man DESTDIR=$RPM_BUILD_ROOT make install.sdk DESTDIR=$RPM_BUILD_ROOT -# make sure that fonts.dir is not empty (Bug #178315) +%ifarch s390 s390x +# make sure that fonts.dir is not empty on s390/s390x (Bug #178315) +LD_LIBRARY_PATH=$RPM_BUILD_ROOT/usr/X11R6/%{_lib} XLOCALEDIR=$RPM_BUILD_ROOT/usr/X11R6/lib/X11/locale \ + $RPM_BUILD_ROOT/usr/X11R6/bin/mkfontscale -b -s -l $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/ +install -c -m 0444 fonts/encodings/encodings.dir $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/ head -n 1 $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/fonts.dir | grep "^0" && exit 1 +%endif # build libxf86config also for s390/s390x (Bug #145823) %ifarch s390 s390x make -C programs/Xserver/hw/xfree86/parser install DESTDIR=$RPM_BUILD_ROOT @@ -2718,6 +2723,9 @@ %clean %changelog -n xorg-x11 +* Wed May 31 2006 - sndirsch@suse.de +- generate /usr/X11R6/lib/X11/fonts/misc/fonts.dir on s390/s390x + during %%install (Bug #178315) * Tue May 30 2006 - sndirsch@suse.de - fixed check for empty /usr/X11R6/lib/X11/fonts/misc/fonts.dir (Bug #178315) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org