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

diff --git a/fedora/Makefile b/fedora/Makefile
index 3c5870c422513ff52d610f35f50e0c55c6460dcb..78367ac3e211025a07c28136593bbdcc7909b642 100644 (file)
--- 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 e496cec33f202eae9b3c62c955d00756070cae90..88746168bd73bf29a5948fa5a21a45ebb98a712d 100644 (file)
--- 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