fixes for chroot contents based on target distro

1 files changed, 48 insertions, 5 deletions

diff --git a/buildsys-build.spec b/buildsys-build.spec
index 7593659..59d111a 100644
--- a/buildsys-build.spec
+++ b/buildsys-build.spec
@@ -4,7 +4,7 @@
 Summary: The base set of packages for a mock chroot
 Name: buildsys-build
 Version: 0.5
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Build Tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -14,10 +14,8 @@ BuildArch: noarch
 Requires: bash
 Requires: buildsys-macros
 Requires: bzip2
-Requires: coreutils
 Requires: cpio
 Requires: diffutils
-Requires: fedora-release
 Requires: gcc
 Requires: gcc-c++
 Requires: gzip
@@ -25,19 +23,64 @@ Requires: make
 Requires: patch
 Requires: perl
 Requires: rpm-build
-Requires: redhat-rpm-config
 Requires: sed
 Requires: tar
 Requires: unzip
 Requires: which
 
+# 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
+%if "%{?fedora}" != ""
+Requires: coreutils
+Requires: fedora-release
+Requires: redhat-rpm-config
+%if "%{?fedora}" == "4" ||  "%{?fedora}" == "3" || "%{?fedora}" == "2" || "%{?fedora}" == "1"
+Requires: elfutils
+%endif
+%if "%{?fedora}" == "4" ||  "%{?fedora}" == "3"
+Requires: python
+%endif
+%endif
+
+%if "%{?rhl}" != ""
+Requires: redhat-release
+%if "%{?rhl}" == "9"
+Requires: coreutils
+Requires: elfutils
+Requires: redhat-rpm-config
+%else
+Requires: file
+Requires: fileutils
+Requires: findutils
+%endif
+# Cater for alternative versions of buildsys-macros
+%if "%{?rhl}" == "8" || "%{?rhl}" == "8.0"
+Requires: redhat-rpm-config
+%endif
+%endif
+
 %description
-The base set of packages for a mock chroot
+The base set of packages for a mock chroot.
 
 %build
+
 %install
+%{__rm} -rf %{buildroot}
+%{__mkdir_p} %{buildroot}
+
 %clean
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc
+
+%changelog
+* Sun Aug 06 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.5-3
+- For FC4 and FC3 include python
+
+* Thu Jun 22 2006 Paul Howarth <paul@city-fan.org> - 0.5-2
+- For FC < 5 or Red Hat Linux 9, include elfutils
+- For non-Fedora distrbutions, require redhat-release instead of fedora-release
+- For Red Hat Linux 8 and earlier, require fileutils instead of coreutils
+- Red Hat Linux 8 requires findutils for brp-strip