mock Makefile,1.8.2.2,1.8.2.3 buildsys-build.spec,1.2.2.2,1.2.2.3

[John Clark Williams (jcwillia)]

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15592

Modified Files:
      Tag: mock-0-6-branch
	Makefile buildsys-build.spec 
Log Message:
fixed incorrect tags for RHEL (was "rhel", should have been "el")


Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/Makefile,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- Makefile	7 Aug 2006 18:29:22 -0000	1.8.2.2
+++ Makefile	7 Aug 2006 18:55:52 -0000	1.8.2.3
@@ -53,5 +53,5 @@
 		rpmbuild $(RPMARGS) --define "fedora $$i" --define "dist .fc$$i" -bb buildsys-build.spec; \
 	done
 	for i in 3 4; do \
-		rpmbuild $(RPMARGS) --define "rhel $$i" --define "dist .rhel$$i" -bb buildsys-build.spec; \
+		rpmbuild $(RPMARGS) --define "el $$i" --define "dist .el$$i" -bb buildsys-build.spec; \
 	done


Index: buildsys-build.spec
===================================================================
RCS file: /cvs/fedora/mock/buildsys-build.spec,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- buildsys-build.spec	7 Aug 2006 17:26:37 -0000	1.2.2.2
+++ buildsys-build.spec	7 Aug 2006 18:55:52 -0000	1.2.2.3
@@ -34,17 +34,17 @@
 Requires: coreutils
 Requires: fedora-release
 Requires: redhat-rpm-config
-%if "%{?fedora}" == "4" ||  "%{?fedora}" == "3" || "%{?fedora}" == "2" || "%{?fedora}" == "1" || "%{?rhel}" == "3"
+%if "%{?fedora}" == "4" ||  "%{?fedora}" == "3" || "%{?fedora}" == "2" || "%{?fedora}" == "1" || "%{?el}" == "3"
 Requires: elfutils
 %endif
-%if "%{?fedora}" == "4" ||  "%{?fedora}" == "3" || "%{?rhel}" == "4"
+%if "%{?fedora}" == "4" ||  "%{?fedora}" == "3" || "%{?el}" == "4"
 Requires: python
 %endif
 %endif
 
-%if "%{?rhl}" != "" || "%{?rhel}" != ""
+%if "%{?rhl}" != "" || "%{?el}" != ""
 Requires: redhat-release
-%if "%{?rhl}" == "9" || "%{?rhel}" == "3" || "%{?rhel}" == "4"
+%if "%{?rhl}" == "9" || "%{?el}" == "3" || "%{?el}" == "4"
 Requires: coreutils
 Requires: elfutils
 Requires: redhat-rpm-config
@@ -54,7 +54,7 @@
 Requires: findutils
 %endif
 # Cater for alternative versions of buildsys-macros
-%if "%{?rhl}" == "8" || "%{?rhl}" == "8.0" || "%{?rhel}" != ""
+%if "%{?rhl}" == "8" || "%{?rhl}" == "8.0" || "%{?el}" != ""
 Requires: redhat-rpm-config
 %endif
 %endif