- skip make clean when building rpm

Changed files:
    X11-makefile-fastbuild.patch -> 1.1
    X11.spec -> 1.25

diff --git a/X11-makefile-fastbuild.patch b/X11-makefile-fastbuild.patch
new file mode 100644 (file)
index 0000000..90f23ca
--- /dev/null
+++ b/X11-makefile-fastbuild.patch
@@ -0,0 +1,14 @@
+--- xc/Makefile.makefile-fastbuild     2003-02-26 04:21:31.000000000 -0500
++++ xc/Makefile        2003-04-06 11:40:20.000000000 -0400
+@@ -83,9 +83,9 @@
+       $(MAKE) $(MFLAGS) Makefile.boot
+       $(MAKE_CMD) $(MFLAGS) VerifyOS
+       $(MAKE_CMD) $(MFLAGS) Makefiles
+-      $(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean
++      if [ -z "$(FAST)" ]; then $(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean; fi
+       $(MAKE_CMD) $(MFLAGS) includes
+-      $(MAKE_CMD) $(MFLAGS) depend
++      if [ -z "$(FAST)" ]; then $(MAKE_CMD) $(MFLAGS) depend; fi
+       $(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World
+       @echo ""
+       @date

diff --git a/X11.spec b/X11.spec
index 0a57745fae204fc61f53449f1a4a103c453b7255..4a9cdbfd4f91ebddf1460f34e154e544153e1e08 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -121,6 +121,7 @@ Patch50:    %{name}-xterm-256colors.patch
 Patch52:       XFree86-kernel_headers.patch
 Patch53:       XFree86-stdint.patch
 Patch54:       %{name}-setxkbmap.patch
+Patch55:       %{name}-makefile-fastbuild.patch
 URL:           http://www.x.org/
 BuildRequires: /usr/bin/perl
 %ifarch %{ix86} alpha amd64
@@ -1734,8 +1735,6 @@ X11-xfs ͦ
 ÛÒÉÆÔ¦× XOrg X11, ÎÅÏÂȦÄΦ ÄÌÑ ×ÁÛϧ ÓÉÓÔÅÍÉ, Xconfigurator ÔÁ
 X11-libs.
 
-#--- %prep ---------------------------
-
 %prep
 %setup -qc -a1 -a2 -a7
 %patch0 -p0
@@ -1789,11 +1788,13 @@ X11-libs.
 %patch52 -p1
 %patch53 -p0
 %patch54 -p1
+%patch55 -p0
 
 rm -f xc/config/cf/host.def
 
 %build
 %{__make} -S -C xc World \
+       FAST=1 \
        DEFAULT_OS_CPU_FROB=%{_target_cpu} \
        CC="%{__cc}" \
        BOOTSTRAPCFLAGS="%{rpmcflags}" \