summaryrefslogtreecommitdiff
path: root/fedora
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-10-07 19:06:46 +0000
committerJakub Jelinek <jakub@redhat.com>2006-10-07 19:06:46 +0000
commitb75a89e7de5530eec2527cb9a8995e48d339a703 (patch)
tree0ba7ff50a8313d44958d0b5fa3082789dc15b566 /fedora
parent16d1b47b4f3f9ae13535ea7a2c02bd207c069d5c (diff)
Adjust for fedora-2_5-branch.
Diffstat (limited to 'fedora')
-rw-r--r--fedora/.cvsignore2
-rw-r--r--fedora/branch.mk8
2 files changed, 5 insertions, 5 deletions
diff --git a/fedora/.cvsignore b/fedora/.cvsignore
index 02a03c3ffc..11718c84e2 100644
--- a/fedora/.cvsignore
+++ b/fedora/.cvsignore
@@ -1,5 +1,5 @@
glibc-*.tar.bz2
glibc-*.src.rpm
-glibc-fedora.patch
+glibc-*fedora.patch
glibc.spec
update.log
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 5c112f2090..608931e4a9 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -1,7 +1,7 @@
# This file is updated automatically by Makefile.
-glibc-branch := fedora
-glibc-base := HEAD
-DIST_BRANCH := devel
-COLLECTION := dist-fc4
+glibc-branch := fedora-2_5
+glibc-base := glibc-2_5-branch
+DIST_BRANCH := FC-6
+COLLECTION := dist-fc6
fedora-sync-date := 2006-10-02 18:58 UTC
fedora-sync-tag := fedora-glibc-20061002T1858