rpms/xorg-x11-server/devel xorg-x11-server.spec,1.71,1.72

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Jun 9 08:26:53 UTC 2006


Author: mharris

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
Invoke aclocal-1.7 to match automake-1.7, also remove the --force option as aclocal-1.7 does not support that


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- xorg-x11-server.spec	9 Jun 2006 07:59:29 -0000	1.71
+++ xorg-x11-server.spec	9 Jun 2006 08:26:48 -0000	1.72
@@ -266,7 +266,7 @@
 #	--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 @@
   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 at redhat.com> 1.1.0-6
 - BR automake and autoconf




More information about the fedora-cvs-commits mailing list