More update tweaks.

diff --git a/fedora/Makefile b/fedora/Makefile
index c5b90f348c0bf3223f774fafe9b250a51635c295..cd2d19bea83585c6c836a2cb197003e013e9b85b 100644 (file)
--- a/fedora/Makefile
+++ b/fedora/Makefile
@@ -16,32 +16,23 @@ on-branch = $(filter-out HEAD,$(glibc-base))
 snapshot-date := $($(glibc-branch)-sync-date)
 snapshot-name := $(shell date -u -d '$(snapshot-date)' $(snapshot-name-fmt))
 
-ifeq ($(glibc-base),HEAD)
-tar-name := glibc
-select-snapshot = -D '$(snapshot-date)'
-snapshot-id = $(glibc-base):$(snapshot-date)
-else
-tar-name := glibc-$(subst _,.,$(patsubst glibc-%-branch,%,$(glibc-base)))
+tar-name := glibc-$(subst _,.,$(patsubst glibc-%-branch,%,\
+                                        $(filter-out HEAD,$(glibc-base))))
 select-snapshot = -r '$($(glibc-branch)-sync-tag)'
 snapshot-id = $($(glibc-branch)-sync-tag)
-endif
 
 
 update:
        now=`date -u $(snapshot-date-fmt)`; \
        name=`date -u -d "$$now" $(snapshot-name-fmt)`; \
-       $(if $(on-branch),\
-         old="$(tag-prefix)$(tar-name)-$$name; \
-         new="$(tag-prefix)$(tar-name)$(snapshot-name)"; \
-         cvs -Q rtag -r $(glibc-base) $$new libc; \
-       , old="$(glibc-base):$(snapshot-date)"; \
-         new="$(glibc-base):$$now"; \
-       ) \
+       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.'; \
         echo 'glibc-branch := $(glibc-branch)'; \
         echo 'glibc-base := $(glibc-base)'; \
         echo "$(glibc-branch)-sync-date := $$now"; \
-        $(if $(on-branch),echo "$(glibc-branch)-sync-tag := $$new";) \
+        echo "$(glibc-branch)-sync-tag := $$new"; \
        ) > branch.mk; \
        cd ..; (set -x; cvs -q update -d -P -j"$$old" -j"$$new") \
                   2>&1 | tee fedora/update.log

diff --git a/fedora/branch.mk b/fedora/branch.mk
index 4cdca39426af6951095cbd28d650f198023fca28..1bc627c1c11bc5cb7fcc08595702c24b1fb65f0b 100644 (file)
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -2,3 +2,4 @@ glibc-branch := fedora
 glibc-base   := HEAD
 
 fedora-sync-date := 2004-09-22 05:52 UTC
+fedora-sync-tag := fedora-glibc-20040922T0552