rpms/xorg-x11-server/devel xorg-x11-server.spec,1.73,1.74

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10648

Modified Files:
	xorg-x11-server.spec 
Log Message:
revert to default automake, and update changelog


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xorg-x11-server.spec	9 Jun 2006 10:37:00 -0000	1.73
+++ xorg-x11-server.spec	9 Jun 2006 10:39:02 -0000	1.74
@@ -54,7 +54,8 @@
 %define with_dri	0
 %endif
 
-BuildRequires: automake17
+#BuildRequires: automake17
+BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 0.99.1
@@ -549,11 +550,10 @@
   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-1.7 before automake, otherwise automake >= 1.9.6 is required in
+- Call aclocal 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.
+  fixed them.  It appears automake 1.9 breaks the build.
 
 * Wed Jun 07 2006 Jeremy Katz <katzj at redhat.com> 1.1.0-6
 - BR automake and autoconf