Don't include the glibc snapshot date in the patch file name.
authorroland <roland>
Wed, 22 Sep 2004 22:19:20 +0000 (22:19 +0000)
committerroland <roland>
Wed, 22 Sep 2004 22:19:20 +0000 (22:19 +0000)
fedora/Makefile
fedora/glibc.spec.in

index 3c5870c..78367ac 100644 (file)
@@ -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
index e496cec..8874616 100644 (file)
@@ -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