diff options
| author | jcwillia <jcwillia> | 2006-08-07 17:26:37 +0000 |
|---|---|---|
| committer | jcwillia <jcwillia> | 2006-08-07 17:26:37 +0000 |
| commit | 01981bad15d664e075a786f6199c0d56c17dcd11 (patch) | |
| tree | 10da8adfbbc74ed5c310f27d22cce506c241ab0c | |
| parent | 34bbe1a989597f08a11283883fb08330dc9c3363 (diff) | |
| download | mock-01981bad15d664e075a786f6199c0d56c17dcd11.tar.gz mock-01981bad15d664e075a786f6199c0d56c17dcd11.tar.xz mock-01981bad15d664e075a786f6199c0d56c17dcd11.zip | |
updated buildsys-build specfile to handle rhel tags; modified Makefile to build all target buildsys-build packages
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | buildsys-build.spec | 13 |
2 files changed, 26 insertions, 8 deletions
@@ -19,8 +19,10 @@ subdirs: for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1 ; done install: - install -D -m 755 mock.py $(DESTDIR)/usr/bin/mock.py - install -D -m 755 mock-yum $(DESTDIR)/usr/libexec/mock-yum + mkdir -p $(DESTDIR)/usr/bin/ + mkdir -p $(DESTDIR)/usr/libexec + install -m 755 mock.py $(DESTDIR)/usr/bin/mock + install -m 755 mock-yum $(DESTDIR)/usr/libexec/mock-yum mkdir -p $(DESTDIR)/var/lib/mock for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done @@ -39,7 +41,20 @@ rpm: archive mkdir build dist rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/build" --define "_srcrpmdir $(PWD)/dist" --define "_rpmdir $(PWD)/dist" -ba mock.spec +RPMARGS := --define "_sourcedir $(PWD)" \ + --define "_builddir $(PWD)/buildsys" \ + --define "_srcrpmdir $(PWD)/buildsys" \ + --define "_rpmdir $(PWD)/buildsys" + buildsys-rpm: rm -rf buildsys mkdir buildsys - rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/buildsys" --define "_srcrpmdir $(PWD)/buildsys" --define "_rpmdir $(PWD)/buildsys" -ba buildsys-build.spec + for i in 1 2 3 4 5 devel; do \ + rpmbuild $(RPMARGS) --define "fedora $$i" --define "dist .fc$$i" -bb buildsys-build.spec; \ + done + for i in 73 8 9; do \ + rpmbuild $(RPMARGS) --define "rhl $$i" --define "dist .rhl$$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; \ + done diff --git a/buildsys-build.spec b/buildsys-build.spec index 59d111a..7311028 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" +%if "%{?fedora}" == "4" || "%{?fedora}" == "3" || "%{?fedora}" == "2" || "%{?fedora}" == "1" || "%{?rhel}" == "3" Requires: elfutils %endif -%if "%{?fedora}" == "4" || "%{?fedora}" == "3" +%if "%{?fedora}" == "4" || "%{?fedora}" == "3" || "%{?rhel}" == "4" Requires: python %endif %endif -%if "%{?rhl}" != "" +%if "%{?rhl}" != "" || "%{?rhel}" != "" Requires: redhat-release -%if "%{?rhl}" == "9" +%if "%{?rhl}" == "9" || "%{?rhel}" == "3" || "%{?rhel}" == "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" +%if "%{?rhl}" == "8" || "%{?rhl}" == "8.0" || "%{?rhel}" != "" Requires: redhat-rpm-config %endif %endif @@ -76,6 +76,9 @@ The base set of packages for a mock chroot. %doc %changelog +* Mon Aug 7 2006 Clark Williams <williams@redhat.com> - 0.5-3 +- added rhel build tags + * Sun Aug 06 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.5-3 - For FC4 and FC3 include python |