From 09d71534bc2734274c60e8c5f62aa95d420c8ac7 Mon Sep 17 00:00:00 2001
From: mharris <mharris>
Date: Jun 09 2006 08:26:48 +0000
Subject: Invoke aclocal-1.7 to match automake-1.7, also remove the --force option as aclocal-1.7 does not support that


---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index d615b27..85dd286 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -266,7 +266,7 @@ drivers, input drivers, or other X modules should install this package.
 #	--disable-dependency-tracking \
 # also, --enable-kdrive just for Xephyr is overkill, should fix that upstream
 
-aclocal --force; automake-1.7 ; autoconf
+aclocal-1.7 ; automake-1.7 ; autoconf
 %configure %{xservers} \
 	--disable-xprint \
 	--disable-static \
@@ -549,11 +549,11 @@ rm -rf $RPM_BUILD_ROOT
   contains 2.1.9 in "extras" and 7.1 does not appear to have a requirement on
   a newer freetype.
 - Janitorial cleanups for spec file changelog consistency.
-- Call aclocal before automake, otherwise automake >= 1.9.6 is required in
+- Call aclocal-1.7 before automake, otherwise automake >= 1.9.6 is required in
   order to rebuild the package.
 - Build 1.1.0-4, 1.1.0-5, and 1.1.0-6 appear to have failed in brew but nobody
   fixed them.  It appears automake 1.9 doesn't like things.  Forcing
-  automake 1.7 on the build to see if that makes a difference.
+  automake-1.7 on the build to see if that makes a difference.
 
 * Wed Jun 07 2006 Jeremy Katz <katzj@redhat.com> 1.1.0-6
 - BR automake and autoconf