diff options
| author | Roland McGrath <roland@gnu.org> | 2004-09-22 22:19:20 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-09-22 22:19:20 +0000 |
| commit | 05bb11efb2a44b9131da48cb8fcb937a73554a75 (patch) | |
| tree | 813e101bfa4cba9081ef3c66bf491fd048ac4d04 /fedora | |
| parent | 0847bc6ef9ca0799ad109be34659c46d4c26f7d8 (diff) | |
| download | glibc-05bb11efb2a44b9131da48cb8fcb937a73554a75.tar.gz glibc-05bb11efb2a44b9131da48cb8fcb937a73554a75.tar.xz glibc-05bb11efb2a44b9131da48cb8fcb937a73554a75.zip | |
Don't include the glibc snapshot date in the patch file name.
Diffstat (limited to 'fedora')
| -rw-r--r-- | fedora/Makefile | 5 | ||||
| -rw-r--r-- | fedora/glibc.spec.in | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fedora/Makefile b/fedora/Makefile index 3c5870c422..78367ac3e2 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 e496cec33f..88746168bd 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 |