--- XFree86-3.3.5_4.2.spec	Wed Sep 15 00:00:39 1999
+++ XFree86.spec	Sun Sep 29 16:50:32 2002
@@ -1,15 +1,15 @@
 Summary: The basic fonts, programs and docs for an X workstation.
 Name: XFree86
-Version: 3.3.5
+Version: 3.3.6
 Release: 1.4.x
 Copyright: MIT
 Group: User Interface/X
 Requires: pam >= 0.57, xbanner, util-linux
 
 
-Source0: ftp://ftp.xfree86.org/pub/XFree86/3.3.5/X335src-1.tgz
-Source1: ftp://ftp.xfree86.org/pub/XFree86/3.3.5/X335src-2.tgz
-Source2: ftp://ftp.xfree86.org/pub/XFree86/3.3.5/X335src-3.tgz
+Source0: ftp://ftp.xfree86.org/pub/XFree86/3.3.6/X336src-1.tar.bz2
+Source1: ftp://ftp.xfree86.org/pub/XFree86/3.3.6/X336src-2.tar.bz2
+Source2: ftp://ftp.xfree86.org/pub/XFree86/3.3.6/X336src-3.tgz
 Source3: xserver.pamd.nopamconsole
 Source4: xdm.pamd
 Source5: xfs.init
@@ -19,8 +19,10 @@
 
 Patch0: XFree86-3.3.4b-rh4.patch
 Patch1: XFree86-3.3-xdm.patch
-Patch2: XFree86-3.3.5-fsstnd.patch
-Patch10: XFree86-3.3.5-sparc.patch
+Patch2: XFree86-3.3.6-fsstnd.patch
+Patch82: XFree86-3.3.5-fsstnd.patch
+Patch90: XFree86-3.3.5-sparc.patch
+Patch10: XFree86-3.3.6-sparc.patch
 Patch11: XFree86-3.3.4-ffb.patch
 Patch12: XFree86-3.3.4b-suncards.patch
 Patch13: XFree86-3.3.4-sparc2.patch
@@ -57,6 +59,11 @@
 Patch38: XFree86-3.3.5-daemon.patch
 Patch39: XFree86-3.3.5-alphafoo.patch
 Patch40: XFree86-3.3.5-noffb.patch
+Patch41: XFree86-3.3.6-m68k.patch
+Patch42: XFree86-3.3.6-fbdev_wrapper.patch
+Patch43: XFree86-3.3.6-no_accel_flags.patch
+Patch44: XFree86-3.3.6-more_accel_defines.patch
+Patch45: XFree86-3.3.6-chunkyc2p_as2703.patch
 
 Exclusivearch: i386 alpha sparc m68k armv4l
 
@@ -581,14 +588,25 @@
 XF86Setup, you should instead install and use Xconfigurator, Red Hat's
 graphical user interface configuration tool for the X Window System.
 
+%package FBDev
+Summary: Framebuffer X Window System server for XFree86.
+Group: User Interface/X Hardware Support
+
+%description FBDev
+The framebuffer X server.
+X server for the generic frame buffer device used on the Amiga, Atari
+and Macintosh/m68k machines.
+
 %prep
 %setup -q -c -a 1 -a 2
 
 %patch0 -p1 -b .rh
 %patch1 -p1 -b .rhxdm
+# fsstnd patch must be adjusted for 3.3.6!!
 %patch2 -p1 -b .fsstnd
 
 # sparc patches from ultrapenguin
+# sparc patch must be adjusted for 3.3.6!!
 %patch10 -p1 -b .sparc
 %patch11 -p1 -b .ffb
 
@@ -613,7 +631,8 @@
 %patch28 -p1 -b .sparcmhead
 
 # security patch for xkbcomp file (deny a symlink attack)
-%patch29 -p1 -b .xkm
+# xkm patch seems to be included in 3.3.6
+#%patch29 -p1 -b .xkm
 # Fix Xconfigurator setup of Diamond SpeedStar A50
 %patch30 -p1 -b .ssa50
 # fix xfs problems on alpha arch
@@ -623,7 +642,8 @@
 # turn of accel for sis6326 cards
 %patch33 -p1 -b .sis
 # fix trident cards
-%patch34 -p1 -b .tridentfix
+# seems to be included in 3.3.6
+#%patch34 -p1 -b .tridentfix
 
 # build on 5.2/4.2
 %patch36 -p1 -b .stat
@@ -633,20 +653,37 @@
 %patch38 -p1 -b .daemon
 %patch39 -p1 -b .alphafoo
 %patch40 -p1 -b .noffb
+%patch41 -p1 -b .m68k
+# if you use chunkyc2p.s of above patch and binutils 2.7.0.3 use patch45:
+%patch45 -p1 -b .chunkyc2p_as2703
+# this patch is obsolete due to RH patch of xinit/Imakefile:
+%patch42 -p1 -b .fbdev_wrapper
+
+# linux 2.0 fb.h struct fb_var_screeninfo has no member accel_flags
+# don't apply patch on linux >= 2.2
+%patch43 -p1 -b .no_accel_flags
+
+# older kernels don't have newer FB_ACCEL_... defines
+%patch44 -p1 -b .more_accel_defines
 
 %build
 %ifarch alpha
 make World -C xc CDEBUGFLAGS="$RPM_OPT_FLAGS -Wa,-m21164a"
 %else
-numprocs=`cat /proc/cpuinfo | grep processor | wc | cut -c7`
-if [ "$numprocs" = "0" ]; then
-  numprocs=1
-fi
-# hack
-%ifarch sparc
-numprocs=2
-%endif
-make World -C xc CDEBUGFLAGS="$RPM_OPT_FLAGS" MAKE="make -j$numprocs"
+ %ifarch m68k
+  # it /should/ run w/o MAKE as we're using GNNU-make
+  make World -C xc CDEBUGFLAGS="$RPM_OPT_FLAGS" MAKE="make"
+ %else
+  numprocs=`cat /proc/cpuinfo | grep processor | wc | cut -c7`
+  if [ "$numprocs" = "0" ]; then
+   numprocs=1
+  fi
+  # hack
+  %ifarch sparc
+   numprocs=2
+  %endif
+  make World -C xc CDEBUGFLAGS="$RPM_OPT_FLAGS" MAKE="make -j$numprocs"
+ %endif
 %endif
 
 # silly, but it works around an apparent egcs bug that breaks netscape
@@ -1344,6 +1381,12 @@
 /usr/X11R6/man/man1/fstobdf.1x
 
 %changelog
+* Sat Sep 28 2002 Frank Meurer <meurer@gmx.STOP_UCE.de>
+- took XFree-3.3.5_4.2.spec from RH 4.2 updates
+- took 3.3.6 sources
+- apply patches for mac68k
+- apply patches for linux 2.0 or other older kernels
+
 * Fri Sep 10 1999 Preston Brown <pbrown@redhat.com>
 - reverted to 3.3.3.1 cyrix driver -- the new one is messed up.