From: Roland McGrath <roland@gnu.org>
Date: Thu, 23 Sep 2004 01:03:59 +0000 (+0000)
Subject: Yet more update tweaks.
X-Git-Tag: cvs/fedora-glibc-2_3_3-55~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1547e88a9aa91cced5f4f11d126f8db1ec13b691;p=thirdparty%2Fglibc.git

Yet more update tweaks.
---

diff --git a/fedora/Makefile b/fedora/Makefile
index d2529394f69..b8708e27375 100644
--- a/fedora/Makefile
+++ b/fedora/Makefile
@@ -25,7 +25,6 @@ snapshot-id = $($(glibc-branch)-sync-tag)
 update:
 	now=`date -u $(snapshot-date-fmt)`; \
 	name=`date -u -d "$$now" $(snapshot-name-fmt)`; \
-	old="$(tag-prefix)$(tar-name)-$(snapshot-name)"; \
 	new="$(tag-prefix)$(tar-name)-$$name"; \
 	cvs -Q rtag $(if $(on-branch),-r $(glibc-base),-D "$$now") $$new libc;\
 	(echo '# This file is updated automatically by Makefile.'; \
@@ -34,7 +33,8 @@ update:
 	 echo "$(glibc-branch)-sync-date := $$now"; \
 	 echo "$(glibc-branch)-sync-tag := $$new"; \
 	) > branch.mk; \
-	cd ..; (set -x; cvs -q update -d -P -j"$$old" -j"$$new") \
+	cd ..; (set -x; cvs -q update -d -P \
+			    -j'$($(glibc-branch)-sync-tag)' -j"$$new") \
 		   2>&1 | tee fedora/update.log
 
 commit-merge:
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 1bc627c1c11..91d751ff052 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -2,4 +2,4 @@ glibc-branch := fedora
 glibc-base   := HEAD
 
 fedora-sync-date := 2004-09-22 05:52 UTC
-fedora-sync-tag := fedora-glibc-20040922T0552
+fedora-sync-tag := fedora-base