From 7afa59d655783507158f5f2f245f421d8fb5276f Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sun, 3 Mar 2013 10:05:08 +0100 Subject: [PATCH] rebase cont (patch8): s/Patch8/Patch5/ Version: 4.2.4.4-1 --- ...-4.2.4-memmove.patch => ncompress-4.2.4.4-memmove.patch | 0 ncompress.spec | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletion(-) rename ncompress-4.2.4-memmove.patch => ncompress-4.2.4.4-memmove.patch (100%) diff --git a/ncompress-4.2.4-memmove.patch b/ncompress-4.2.4.4-memmove.patch similarity index 100% rename from ncompress-4.2.4-memmove.patch rename to ncompress-4.2.4.4-memmove.patch diff --git a/ncompress.spec b/ncompress.spec index 7365d82..f881013 100644 --- a/ncompress.spec +++ b/ncompress.spec @@ -29,7 +29,11 @@ Patch3: ncompress-4.2.4.4-2GB.patch # ~> #207001 Patch4: ncompress-4.2.4.4-endians.patch -Patch8: ncompress-4.2.4-memmove.patch +# use memmove instead of memcpy +# ~> 760657 +# ~> downstream +Patch5: ncompress-4.2.4.4-memmove.patch + BuildRequires: gcc glibc-devel fileutils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,6 +68,7 @@ sed "s/\$(ARCH_FLAGS)/$ARCH_FLAGS/" Makefile.def > Makefile %patch2 -p1 -b .filenamelen %patch3 -p1 -b .2GB %patch4 -p1 -b .endians +%patch5 -p1 -b .memmove %build make CFLAGS="%{optflags} %{?nc_endian} %{?nc_align}"