Hello community, here is the log from the commit of package xgl checked in at Thu Apr 6 17:47:57 CEST 2006. -------- --- xgl/xgl.changes 2006-04-05 18:01:13.000000000 +0200 +++ xgl/xgl.changes 2006-04-06 17:47:13.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 6 03:33:17 CEST 2006 - dreveman@suse.de + +- Add xgl-maprules-tolower-fix.diff to fix 64bit issue in xkb + code. +- Fix PREFIX for glitz and proto packages. +- Remove some lines that were left from using compat70 tarboll. + +------------------------------------------------------------------- New: ---- xgl-maprules-tolower-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.yaDrSe/_old 2006-04-06 17:47:31.000000000 +0200 +++ /var/tmp/diff_new_pack.yaDrSe/_new 2006-04-06 17:47:31.000000000 +0200 @@ -23,7 +23,7 @@ PreReq: %fillup_prereq Autoreqprov: on Version: cvs_060405 -Release: 1 +Release: 2 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -41,6 +41,7 @@ Patch: Xserver-suse-sysconfig.diff Patch1: xgl-security-file-dir.diff Patch2: xgl-xpstubs-link-hack.diff +Patch3: xgl-maprules-tolower-fix.diff %description Xgl is an Xserver that uses OpenGL for its drawing operations. Some @@ -72,16 +73,15 @@ Numerous others have contributed to the X11 project. %prep -PREFIX=/usr/X11R6/lib/xgl rm -rf $RPM_BUILD_DIR/* -rm -rf $PREFIX %setup -q -n . -D -T -b 0 -b 1 -b 4 -b 6 -b 7 -b 8 -b 9 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/Xserver-suse-sysconfig.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-security-file-dir.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-xpstubs-link-hack.diff || exit 1 +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-maprules-tolower-fix.diff || exit 1 %build -PREFIX=/usr/X11R6/lib/xgl +PREFIX=$RPM_BUILD_ROOT/usr/X11R6/lib/xgl [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/X11R6/ mkdir -p $PREFIX @@ -107,23 +107,17 @@ popd %install -PREFIX=/usr/X11R6/lib/xgl -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates $RPM_BUILD_ROOT$PREFIX $RPM_BUILD_ROOT/etc/X11/ +PREFIX=$RPM_BUILD_ROOT/usr/X11R6/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 popd cp $RPM_SOURCE_DIR/README.* . cp $RPM_SOURCE_DIR/sysconfig.displaymanager.template $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.displaymanager-%name cp $RPM_SOURCE_DIR/xgl-cards-white-list $RPM_BUILD_ROOT/etc/X11/ -cp -a $PREFIX/%_lib $RPM_BUILD_ROOT$PREFIX/ -rm -f $RPM_BUILD_ROOT$PREFIX/%_lib/*.so -rm -rf $RPM_BUILD_ROOT$PREFIX/%_lib/pkgconfig +rm -rf $PREFIX find $RPM_BUILD_ROOT \( -name \*.a -o -name \*.la \) -print -execdir rm \{\} + rm -rf $RPM_BUILD_ROOT/usr/%_lib/pkgconfig $RPM_BUILD_ROOT/usr/include -for f in /usr/%_lib/pkgconfig/*.pc_by_xgl_rpm ; do - r="${f%.pc_by_xgl_rpm}.pc" - test -f "$f" && rm -f "$f" "$r" -done 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 @@ -151,6 +145,11 @@ /etc/X11/xgl-cards-white-list %changelog -n xgl +* Thu Apr 06 2006 - dreveman@suse.de +- Add xgl-maprules-tolower-fix.diff to fix 64bit issue in xkb + code. +- Fix PREFIX for glitz and proto packages. +- Remove some lines that were left from using compat70 tarboll. * Wed Apr 05 2006 - ro@suse.de - do not build as root * Wed Apr 05 2006 - dreveman@suse.de ++++++ xgl-maprules-tolower-fix.diff ++++++ ? xorg-server-1.1.99.1.tar.bz2 ? xorg-server-1.1.99.1.tar.gz ? doc/Xserver.1x ? hw/xgl/glxext/.libs ? hw/xgl/glxext/libxglglxext.la ? hw/xgl/glxext/xglglxext.lo ? hw/xgl/glxext/xglglxlog.lo ? hw/xgl/glxext/module/.libs ? hw/xgl/glxext/module/glxmodule.lo ? hw/xgl/glxext/module/libglxext.la ? hw/xwin/winprefslex.c ? hw/xwin/winprefsyacc.c ? hw/xwin/winprefsyacc.h Index: xkb/maprules.c =================================================================== RCS file: /cvs/xorg/xserver/xorg/xkb/maprules.c,v retrieving revision 1.5.6.1 diff -u -r1.5.6.1 maprules.c --- xkb/maprules.c 30 Mar 2006 16:39:31 -0000 1.5.6.1 +++ xkb/maprules.c 6 Apr 2006 00:42:32 -0000 @@ -1092,7 +1092,7 @@ for ( ; GetInputLine(file,&line,False); line.num_line= 0) { if (line.line[0]=='!') { tok = strtok(&(line.line[1]), " \t"); - if (_XkbStrCaseCmp(tolower(tok),"model") == 0) + if (_XkbStrCaseCmp(tok,"model") == 0) headingtype = HEAD_MODEL; else if (_XkbStrCaseCmp(tok,"layout") == 0) headingtype = HEAD_LAYOUT; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...