The attached patch and file provides separation between the distvar (fedora, rhel, etc.) and the project (core, epel, etc.) in the branches system in CVS. It also adds a bit of documentation to the branches file. -- Ignacio Vazquez-Abrams <ivazqueznet@xxxxxxxxx>
Index: Makefile.common =================================================================== RCS file: /cvs/pkgs/common/Makefile.common,v retrieving revision 1.54 diff -u -r1.54 Makefile.common --- Makefile.common 4 May 2007 15:39:29 -0000 1.54 +++ Makefile.common 14 May 2007 15:31:09 -0000 @@ -25,6 +25,7 @@ DIST = $(word 2, $(BRANCHINFO)) DISTVAR = $(word 3, $(BRANCHINFO)) DISTVAL = $(word 4, $(BRANCHINFO)) +PROJECT = $(word 5, $(BRANCHINFO)) DIST_DEFINES = --define "dist $(DIST)" --define "$(DISTVAR) $(DISTVAL)" BUILD_FLAGS ?= $(shell echo $(KOJI_FLAGS)) @@ -41,11 +42,7 @@ BUILDDIR ?= $(WORKDIR) RPMDIR ?= $(WORKDIR) MOCKDIR ?= $(WORKDIR) -ifeq ($(DISTVAR),epel) -DISTVAR := rhel -MOCKCFG ?= fedora-$(DISTVAL)-$(BUILDARCH)-epel.cfg -else -MOCKCFG ?= fedora-$(DISTVAL)-$(BUILDARCH)-core.cfg +MOCKCFG ?= fedora-$(DISTVAL)-$(BUILDARCH)-$(PROJECT).cfg endif ## SOURCEDIR is special; it has to match the CVS checkout directory, ## because the CVS checkout directory contains the patch files. So it basically
#<branch>:<distro>:<disttag>:<distvar>:<distval>:<project> # branch: CVS branch (RHL-9, FC-3, EL-4, etc.) # distro: Distro and version (rhl8, fc3, el4, etc.) # disttag: Package suffix (.rhl8, .fc3, .el4, etc.) # distvar: Variable to test in the spec file (rhl, fedora, rhel, etc.) # distval: Value to set the above variable to (8, 3, 4, etc.) # project: Project the branch belongs to (legacy, core, epel, etc.) RHL-7:rhl7:.rhl7:rhl:7:legacy RHL-8:rhl8:.rhl8:rhl:8:legacy RHL-9:rhl9:.rhl9:rhl:9:legacy EL-4:el4:.el4:rhel:4:epel EL-5:el5:.el5:rhel:5:epel FC-1:fc1:.fc1:fedora:1:legacy FC-2:fc2:.fc2:fedora:2:legacy FC-3:fc3:.fc3:fedora:3:core FC-4:fc4:.fc4:fedora:4:core FC-5:fc5:.fc5:fedora:5:core FC-6:fc6:.fc6:fedora:6:core devel:dist-fc7:.fc7:fedora:7:core
Attachment:
signature.asc
Description: This is a digitally signed message part
-- Fedora-maintainers mailing list Fedora-maintainers@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-maintainers
-- Fedora-maintainers-readonly mailing list Fedora-maintainers-readonly@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-maintainers-readonly
