Hello community, here is the log from the commit of package xgl checked in at Sun Aug 6 22:20:07 CEST 2006. -------- --- xgl/xgl.changes 2006-08-01 22:46:34.000000000 +0200 +++ xgl/xgl.changes 2006-08-04 22:11:25.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 4 22:11:10 CEST 2006 - sndirsch@suse.de + +- fixed font/xkb/rgb path for X.Org 7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.whFnaC/_old 2006-08-06 22:20:00.000000000 +0200 +++ /var/tmp/diff_new_pack.whFnaC/_new 2006-08-06 22:20:00.000000000 +0200 @@ -24,7 +24,7 @@ Requires: xgl-hardware-list Autoreqprov: on Version: cvs_060522 -Release: 6 +Release: 7 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -78,6 +78,19 @@ Numerous others have contributed to the X11 project. +%if "%(xft-config --prefix)" == "/usr" +%define _xglprefix /usr +%define _default_font_path /usr/share/fonts/misc,/usr/share/fonts/truetype,/usr/share/fonts/Type1,/usr/share/fonts/100dpi,/usr/share/fonts/75dpi +%define _rgb_path /usr/share/X11/rgb +%define _xkb_path /usr/share/X11/xkb +%define _xkb_output /var/lib/xkb/compiled/ +%else +%define _xglprefix /usr/X11R6 +%define _default_font_path /usr/X11R6/lib/X11/fonts/misc,/usr/X11R6/lib/X11/fonts/truetype,/usr/X11R6/lib/X11/fonts/Type1,/usr/X11R6/lib/X11/fonts/100dpi,/usr/X11R6/lib/X11/fonts/75dpi +%define _rgb_path /usr/X11R6/lib/X11/rgb +%define _xkb_path /etc/X11/xkb +%define _xkb_output /etc/X11/xkb/compiled +%endif %prep rm -rf $RPM_BUILD_DIR/* %setup -q -n . -D -T -b 0 -b 1 -b 4 -b 6 -b 7 -b 8 -b 9 @@ -93,9 +106,9 @@ patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-xkb.diff || exit 1 %build -PREFIX=$RPM_BUILD_ROOT/usr/X11R6/lib/xgl +PREFIX=$RPM_BUILD_ROOT/%{_xglprefix}/lib/xgl [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/ +mkdir -p $RPM_BUILD_ROOT/%{_xglprefix}/ mkdir -p $PREFIX PKG_CONFIG_ORIG=$PKG_CONFIG_PATH # Build inside own development system @@ -114,12 +127,12 @@ popd done pushd xorg-server-* -./configure --prefix=/usr/X11R6 --libdir=/usr/X11R6/%_lib --enable-xgl --disable-xorg --disable-xprint --enable-glx --enable-dri --with-mesa-source=$RPM_BUILD_DIR/Mesa --with-release-snap=1 --disable-dmx --disable-xvfb --disable-xnest --enable-xglx --with-default-font-path=/usr/X11R6/lib/X11/fonts/misc,/usr/X11R6/lib/X11/fonts/TTF,/usr/X11R6/lib/X11/fonts/Type1,/usr/X11R6/lib/X11/fonts/100dpi,/usr/X11R6/lib/X11/fonts/75dpi --sysconfdir=/etc/X11 --localstatedir=/var --with-rgb-path=/usr/X11R6/lib/X11/rgb --with-xkb-path=/etc/X11/xkb --with-xkb-output=/etc/X11/xkb/compiled --disable-aiglx +./configure --prefix=%{_xglprefix} --libdir=%{_xglprefix}/%_lib --enable-xgl --disable-xorg --disable-xprint --enable-glx --enable-dri --with-mesa-source=$RPM_BUILD_DIR/Mesa --with-release-snap=1 --disable-dmx --disable-xvfb --disable-xnest --enable-xglx --with-default-font-path=%{_default_font_path} --sysconfdir=/etc/X11 --localstatedir=/var --with-rgb-path=%{_rgb_path} --with-xkb-path=%{_xkb_path} --with-xkb-output=%{_xkb_output} --disable-aiglx make %{?jobs:-j %jobs} popd %install -PREFIX=$RPM_BUILD_ROOT/usr/X11R6/lib/xgl +PREFIX=$RPM_BUILD_ROOT/%{_xglprefix}/lib/xgl mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates $RPM_BUILD_ROOT/etc/X11/ pushd xorg-server-* make DESTDIR=$RPM_BUILD_ROOT install @@ -128,12 +141,12 @@ cp $RPM_SOURCE_DIR/sysconfig.displaymanager.template $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.displaymanager-%name rm -rf $PREFIX find $RPM_BUILD_ROOT \( -name \*.a -o -name \*.la \) -print -execdir rm \{\} + +rm $RPM_BUILD_ROOT/%{_xglprefix}/%_lib/pkgconfig/xorg-server.pc rm -rf $RPM_BUILD_ROOT/usr/%_lib/pkgconfig $RPM_BUILD_ROOT/usr/include -rm $RPM_BUILD_ROOT/usr/X11R6/%_lib/pkgconfig/xorg-server.pc -rm $RPM_BUILD_ROOT/usr/X11R6/man/man1/Xserver.1x -rm $RPM_BUILD_ROOT/usr/X11R6/share/aclocal/xorg-server.m4 +rm $RPM_BUILD_ROOT/%{_xglprefix}/man/man1/Xserver.1x +rm $RPM_BUILD_ROOT/%{_xglprefix}/share/aclocal/xorg-server.m4 rm $RPM_BUILD_ROOT/etc/X11/xserver/SecurityPolicy -rm $RPM_BUILD_ROOT/etc/X11/xkb/compiled/README.compiled +rm $RPM_BUILD_ROOT/%{_xkb_output}/README.compiled %post %{fillup_only -an displaymanager} @@ -145,14 +158,16 @@ %files %defattr(-, root, root) %doc README.* -/usr/X11R6/bin/Xgl -%dir /usr/X11R6/%_lib/xorg -%dir /usr/X11R6/%_lib/xorg/modules -%dir /usr/X11R6/%_lib/xorg/modules/xgl -/usr/X11R6/%_lib/xorg/modules/xgl/lib* +%{_xglprefix}/bin/Xgl +%dir %{_xglprefix}/%_lib/xorg +%dir %{_xglprefix}/%_lib/xorg/modules +%dir %{_xglprefix}/%_lib/xorg/modules/xgl +%{_xglprefix}/%_lib/xorg/modules/xgl/lib* /var/adm/fillup-templates/sysconfig.displaymanager-%name %changelog -n xgl +* Fri Aug 04 2006 - sndirsch@suse.de +- fixed font/xkb/rgb path for X.Org 7 * Tue Aug 01 2006 - danw@suse.de - Revert incorrect changes to xorg HEAD xkb code that break the keyboard layout viewer. #179433 / bugs.freedesktop.org #7137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...