summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjcwillia <jcwillia>2006-08-07 18:55:52 +0000
committerjcwillia <jcwillia>2006-08-07 18:55:52 +0000
commitccf7b691a5a8579e26b2a194384fca4c07738584 (patch)
tree441cd36938b92fb1168239df5927ca943e84b1e1
parentda8e42aeed4c1632b7d6a7fec79c41f4b6425d2c (diff)
downloadmock-ccf7b691a5a8579e26b2a194384fca4c07738584.tar.gz
mock-ccf7b691a5a8579e26b2a194384fca4c07738584.tar.xz
mock-ccf7b691a5a8579e26b2a194384fca4c07738584.zip
fixed incorrect tags for RHEL (was "rhel", should have been "el")
-rw-r--r--Makefile2
-rw-r--r--buildsys-build.spec10
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index bced0a0..89da574 100644
--- a/Makefile
+++ b/Makefile
@@ -53,5 +53,5 @@ buildsys-rpm:
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
diff --git a/buildsys-build.spec b/buildsys-build.spec
index 7311028..6d2a8ac 100644
--- a/buildsys-build.spec
+++ b/buildsys-build.spec
@@ -34,17 +34,17 @@ Requires: which
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: fileutils
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