From: Roland McGrath <roland@gnu.org>
Date: Wed, 22 Sep 2004 22:19:20 +0000 (+0000)
Subject: Don't include the glibc snapshot date in the patch file name.
X-Git-Tag: cvs/fedora-glibc-2_3_3-55~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05bb11efb2a44b9131da48cb8fcb937a73554a75;p=thirdparty%2Fglibc.git

Don't include the glibc snapshot date in the patch file name.
---

diff --git a/fedora/Makefile b/fedora/Makefile
index 3c5870c4225..78367ac3e21 100644
--- a/fedora/Makefile
+++ b/fedora/Makefile
@@ -63,8 +63,7 @@ spec-tag = $(subst .,_,$(spec-nvr))
 tag: glibc.spec
 	cd ..; cvs -Q tag -c $(tag-prefix)$(spec-tag)
 
-$(tar-name)-$(snapshot-name)-$(glibc-branch).patch: makepatch.awk glibc.spec \
-						    FORCE
+$(tar-name)-$(glibc-branch).patch: makepatch.awk glibc.spec FORCE
 	(cd ..; cvs -q diff -upN \
 		    $(select-snapshot) -r $(tag-prefix)$(spec-tag)) | \
 	awk -v OLDVER=$(tar-name)-$(snapshot-name) \
@@ -93,7 +92,7 @@ $(tar-name)-$(snapshot-name).tar.bz2: Makefile branch.mk
 
 archives = $(tar-name)-$(snapshot-name).tar.bz2 \
 	   $(tar-name)-$(glibc-branch)-$(snapshot-name).tar.bz2 \
-	   $(tar-name)-$(snapshot-name)-$(glibc-branch).patch
+	   $(tar-name)-$(glibc-branch).patch
 finish_archive: $(archives)
 
 archive: glibc.spec
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index e496cec33f2..88746168bd7 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -14,7 +14,7 @@ Copyright: LGPL
 Group: System Environment/Libraries
 Source0: %{name}-%{glibcdate}.tar.bz2
 Source1: %{name}-fedora-%{glibcdate}.tar.bz2
-Patch0: %{name}-%{glibcdate}-fedora.patch
+Patch0: %{name}-fedora.patch
 Patch1: %{name}-nptl-check.patch
 Patch2: %{name}-ppc-assume.patch
 Patch3: %{name}-execstack-disable.patch