mock Makefile,1.8,1.8.2.1 buildsys-build.spec,1.2.2.1,1.2.2.2

[John Clark Williams (jcwillia)]

Author: jcwillia

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

Modified Files:
      Tag: mock-0-6-branch
	Makefile buildsys-build.spec 
Log Message:
updated buildsys-build specfile to handle rhel tags; modified Makefile to build all target buildsys-build packages


Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/Makefile,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- Makefile	12 Apr 2006 14:23:17 -0000	1.8
+++ Makefile	7 Aug 2006 17:26:37 -0000	1.8.2.1
@@ -41,7 +41,20 @@
 	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


Index: buildsys-build.spec
===================================================================
RCS file: /cvs/fedora/mock/buildsys-build.spec,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- buildsys-build.spec	7 Aug 2006 15:05:23 -0000	1.2.2.1
+++ buildsys-build.spec	7 Aug 2006 17:26:37 -0000	1.2.2.2
@@ -34,17 +34,17 @@
 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: 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 @@
 %doc
 
 %changelog
+* Mon Aug  7 2006 Clark Williams <williams at 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