[SDL/f15/master] Correct patch application
Petr Pisar
ppisar at fedoraproject.org
Fri Feb 18 12:35:58 UTC 2011
commit ab5a24038fd3e7d61cac1aea3eb76765b73ae7b2
Author: Petr Písař <ppisar at redhat.com>
Date: Fri Feb 18 13:20:24 2011 +0100
Correct patch application
... => SDL-1.2.14-SDL_BlitCopyOverlap_memcpy.patch | 0
SDL.spec | 5 +++--
2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/SDL-1.2-SDL_BlitCopyOverlap_memcpy.patch b/SDL-1.2.14-SDL_BlitCopyOverlap_memcpy.patch
similarity index 100%
rename from SDL-1.2-SDL_BlitCopyOverlap_memcpy.patch
rename to SDL-1.2.14-SDL_BlitCopyOverlap_memcpy.patch
diff --git a/SDL.spec b/SDL.spec
index 1023ab1..52eb25e 100644
--- a/SDL.spec
+++ b/SDL.spec
@@ -21,7 +21,7 @@ Patch5: SDL-1.2.14-x11_grab_down_button.patch
# Newer Linux has bigger structure for joystick, in upstream, sdl900, rh624241
Patch6: SDL-1.2.14-linux_2.6_joystick.patch
# Do not call memcpy() on overlapping areas, in upstream, sdl1090, rh669844
-Patch7: SDL-1.2-SDL_BlitCopyOverlap_memcpy.patch
+Patch7: SDL-1.2.14-SDL_BlitCopyOverlap_memcpy.patch
URL: http://www.libsdl.org/
License: LGPLv2+
@@ -82,7 +82,7 @@ static SDL applications.
%patch4 -p1 -b .xio_error
%patch5 -p1 -b .x11_grab_down_button
%patch6 -p1 -b .linux_2.6_joystick
-%patch7 -p1 -b ,SDL_BlitCopyOverlap_memcpy
+%patch7 -p1 -b .SDL_BlitCopyOverlap_memcpy
for F in CREDITS; do
iconv -f iso8859-1 -t utf-8 < "$F" > "${F}.utf"
touch --reference "$F" "${F}.utf"
@@ -147,6 +147,7 @@ rm -rf %{buildroot}
%changelog
* Fri Feb 18 2011 Petr Pisar <ppisar at redhat.com> - 1.2.14-10
- Do not call memcpy() on overlapping areas (bug #669844)
+- Correct patch application
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.14-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list