mock buildsys-build.spec,1.3,1.4

[John Clark Williams (jcwillia)]

Author: jcwillia

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

Modified Files:
	buildsys-build.spec 
Log Message:
modified to match 0.6 branch; bumped version to match mock for this branch


Index: buildsys-build.spec
===================================================================
RCS file: /cvs/fedora/mock/buildsys-build.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buildsys-build.spec	7 Aug 2006 19:24:54 -0000	1.3
+++ buildsys-build.spec	7 Aug 2006 21:52:01 -0000	1.4
@@ -3,8 +3,8 @@
 #
 Summary: The base set of packages for a mock chroot
 Name: buildsys-build
-Version: 0.5
-Release: 4%{?dist}
+Version: 0.7
+Release: 1%{?dist}
 License: GPL
 Group: Development/Build Tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -30,21 +30,34 @@
 
 # The rather long-winded format of the conditionals is needed for compatbility
 # with old rpm versions such as were supplied with Red Hat Linux 7
+
+# Fedora block
 %if "%{?fedora}" != ""
 Requires: coreutils
 Requires: fedora-release
 Requires: redhat-rpm-config
-%if "%{?fedora}" == "4" ||  "%{?fedora}" == "3" || "%{?fedora}" == "2" || "%{?fedora}" == "1" || "%{?el}" == "3"
+%if "%{?fedora}" == "4" ||  "%{?fedora}" == "3" || "%{?fedora}" == "2" || "%{?fedora}" == "1"
 Requires: elfutils
+%if "%{?fedora}" == "4" ||  "%{?fedora}" == "3"
+Requires: python
+%endif
 %endif
-%if "%{?fedora}" == "4" ||  "%{?fedora}" == "3" || "%{?el}" == "4"
+
+# RHEL block
+%if "%{?el}" != ""
+Requires: redhat-release
+Requires: coreutils
+Requires: elfutils
+Requires: redhat-rpm-config
+%if "%{?el}" == "4"
 Requires: python
 %endif
 %endif
 
-%if "%{?rhl}" != "" || "%{?el}" != ""
+# Red Hat Linux [789] block
+%if "%{?rhl}" != ""
 Requires: redhat-release
-%if "%{?rhl}" == "9" || "%{?el}" == "3" || "%{?el}" == "4"
+%if "%{?rhl}" == "9"
 Requires: coreutils
 Requires: elfutils
 Requires: redhat-rpm-config
@@ -54,7 +67,7 @@
 Requires: findutils
 %endif
 # Cater for alternative versions of buildsys-macros
-%if "%{?rhl}" == "8" || "%{?rhl}" == "8.0" || "%{?el}" != ""
+%if "%{?rhl}" == "8" || "%{?rhl}" == "8.0"
 Requires: redhat-rpm-config
 %endif
 %endif
@@ -76,6 +89,10 @@
 %doc
 
 %changelog
+* Mon Aug  7 2006 Clark Williams <williams at redhat.com> - 0.7-1
+- refactored conditional blocks for simplicity
+- bumped version to match mock
+
 * Mon Aug  7 2006 Clark Williams <williams at redhat.com> - 0.5-4
 - added rhel build tags