rpms/xorg-x11/devel xorg-x11.spec,1.159,1.160

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	xorg-x11.spec 
Log Message:
Revert with_check_buildroot_for_CVS_dirs changes, as it wont be needed now.


Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- xorg-x11.spec	3 Apr 2005 00:48:05 -0000	1.159
+++ xorg-x11.spec	3 Apr 2005 13:54:19 -0000	1.160
@@ -212,9 +212,6 @@
 # Use ldd -r to test for undef syms.  Xorg isn't clean enough for this to be
 # enabled except for developmental testing purposes.
 %define with_undef_sym_test			0
-# Scans RPM_BUILD_ROOT for CVS dirs after install completes, failing the build
-# if any are found.
-%define with_check_buildroot_for_CVS_dirs	1
 # with_fortify_source is used to manually enable gcc's fortify source support
 # available in newer gcc releases.  It causes "-D_FORTIFY_SOURCE=2" to be
 # added to the gcc CFLAGS when building.  Currently, our RHEL4 and FC3 gcc
@@ -1498,12 +1495,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 # Speed up script processing
 export LANG=C
-#if %{cvs_build}
-# If RPM_BUILD_ROOT contains a CVS dir, search and destroy them througout the
-# tree before building.
-[ -d "$RPM_BUILD_DIR/%{name}-%{version}/xc/CVS" ] && find "$RPM_BUILD_DIR/%{name}-%{version}/xc/CVS" -name "CVS" -type d | xargs rm -rf
-#find . -name .cvsignore -type f |xargs rm -f
-#endif
+# Make sure RPM_BUILD_DIR does not contain any CVS dirs prior to building
+[ -d "$RPM_BUILD_DIR/%{name}-%{version}/xc/CVS" ] && \
+    find "$RPM_BUILD_DIR/%{name}-%{version}/xc/CVS" -name CVS -type d | xargs rm -rf
 
 %if %{DebuggableBuild}
 makeg World -C xc FAST=1
@@ -1921,14 +1915,6 @@
 }
 %endif
 
-%if %{with_check_buildroot_for_CVS_dirs}
-echo "Checking RPM_BUILD_ROOT for accidentally installed CVS metadata directories ... "
-{
-    find $RPM_BUILD_ROOT -type d |grep "/CVS$" &> /dev/null && EXIT_STATUS=1 || echo EXIT_STATUS=0
-    [ $EXIT_STATUS -eq 1 ] && echo -e "\nERROR: CVS metadata files found in RPM_BUILD_ROOT failing build."
-    exit $EXIT_STATUS
-}
-%endif
 
 ######################################################################
 #########  SCRIPT SECTION  ###########################################
@@ -3525,11 +3511,6 @@
 
 %changelog
 * Sat Apr  2 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-16
-- Removed previous CVS dir check, and fixed the code in %%build that calls
-  rm -rf on CVS metadata dirs, which should accomplish the same thing.
-- Added new with_check_buildroot_for_CVS_dirs macro, which enables a new post
-  build check in %%check that scans for CVS dirs and fails the build if any
-  are found.
 
 * Sat Apr  2 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-15
 - Added "find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf" to rm -rf