From a7db33c68fffef1bbc9894a1dab7e52b8bc7bdef Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Fri, 10 Aug 2007 01:48:42 +0000
Subject: Update import stuff for new Fedora systems

---
 fedora/Makefile | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/fedora/Makefile b/fedora/Makefile
index e2d037341b..851cfca409 100644
--- a/fedora/Makefile
+++ b/fedora/Makefile
@@ -161,31 +161,30 @@ $(spec-nvr).src.rpm: glibc.spec $(archives)
 
 ###
 # These rules are for dealing with the Fedora package repository
-# and the Red Hat internal build system.
+# and build system.
 #
-# To use this, put in ~/.cvsdistrc at least a line:
-#	DIST_COMMON = /some/checkout/of/dist/common
+# To use this, put in ~/.cvspkgsrc at least a line:
+#	COMMON_DIR ?= /some/checkout/of/pkgs/common
 # We will find cvs-import.sh there and use its CVS/Root for where to commit.
 
 .PHONY: dist-import
 
--include ~/.cvsdistrc
+-include ~/.cvspkgsrc
 
-ifdef DIST_COMMON
+ifdef COMMON_DIR
 DIST_BRANCH ?= devel
-COLLECTION ?= dist-fc4
-BHC_FLAGS ?= -n
+COLLECTION ?= dist-f8
 
-bhc-baseurl := cvs://cvs.devel.redhat.com/cvs/dist?rpms
-bhc-url = $(bhc-baseurl)/glibc/$(DIST_BRANCH)\#$(spec-tag)
+pkgs-baseurl := cvs://cvs.fedoraproject.org/cvs/pkgs?rpms
+pkgs-url = $(pkgs-baseurl)/glibc/$(DIST_BRANCH)\#$(spec-tag)
 
-dist-import: $(spec-nvr).src.rpm
-	$(DIST_COMMON)/cvs-import.sh -b $(DIST_BRANCH) $<
+pkgs-import: $(spec-nvr).src.rpm
+	$(COMMON_DIR)/cvs-import.sh -b $(DIST_BRANCH) $<
 	rpm -qp $< --queryformat '[%{FILEMD5S}  %{FILENAMES}\n]' > $@.new
 	mv -f $@.new $@
 
-dist-build: dist-import
-	bhc $(BHC_FLAGS) $(COLLECTION) '$(bhc-url)'
+build: pkgs-import
+	koji build $(BUILD_FLAGS) $(COLLECTION) '$(pkgs-url)'
 
 endif
 ###
-- 
cgit v1.2.3