From 2919e3ec1ad1c3aa628276332d277ac65ced53b9 Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Tue, 23 Aug 2011 11:00:57 -0400 Subject: [PATCH] Remove stray patch reference --- .gitignore | 1 + libffi-3.0.9-defines.patch | 63 -------------------------------------- libffi.spec | 7 +++-- sources | 2 +- 4 files changed, 6 insertions(+), 67 deletions(-) delete mode 100644 libffi-3.0.9-defines.patch diff --git a/.gitignore b/.gitignore index 97f8498..1fb624c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libffi-3.0.9.tar.gz +/libffi-3.0.10.tar.gz diff --git a/libffi-3.0.9-defines.patch b/libffi-3.0.9-defines.patch deleted file mode 100644 index 7c76f7c..0000000 --- a/libffi-3.0.9-defines.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up libffi-3.0.9/include/ffi.h.in.defines libffi-3.0.9/include/ffi.h.in ---- libffi-3.0.9/include/ffi.h.in.defines 2010-07-03 22:25:07.000000000 +0200 -+++ libffi-3.0.9/include/ffi.h.in 2010-07-03 22:25:35.000000000 +0200 -@@ -57,7 +57,9 @@ extern "C" { - #endif - - /* Specify which architecture libffi is configured for. */ -+#ifndef @TARGET@ - #define @TARGET@ -+#endif - - /* ---- System configuration information --------------------------------- */ - -diff -up libffi-3.0.9/src/powerpc/ffitarget.h.defines libffi-3.0.9/src/powerpc/ffitarget.h ---- libffi-3.0.9/src/powerpc/ffitarget.h.defines 2010-07-03 22:26:56.000000000 +0200 -+++ libffi-3.0.9/src/powerpc/ffitarget.h 2010-07-03 22:27:20.000000000 +0200 -@@ -31,12 +31,18 @@ - /* ---- System specific configurations ----------------------------------- */ - - #if defined (POWERPC) && defined (__powerpc64__) /* linux64 */ -+#ifndef POWERPC64 - #define POWERPC64 -+#endif - #elif defined (POWERPC_DARWIN) && defined (__ppc64__) /* Darwin */ -+#ifndef POWERPC64 - #define POWERPC64 -+#endif - #elif defined (POWERPC_AIX) && defined (__64BIT__) /* AIX64 */ -+#ifndef POWERPC64 - #define POWERPC64 - #endif -+#endif - - #ifndef LIBFFI_ASM - typedef unsigned long ffi_arg; -diff -up libffi-3.0.9/src/s390/ffitarget.h.defines libffi-3.0.9/src/s390/ffitarget.h ---- libffi-3.0.9/src/s390/ffitarget.h.defines 2010-07-03 22:27:41.000000000 +0200 -+++ libffi-3.0.9/src/s390/ffitarget.h 2010-07-03 22:27:53.000000000 +0200 -@@ -28,8 +28,10 @@ - #define LIBFFI_TARGET_H - - #if defined (__s390x__) -+#ifndef S390X - #define S390X - #endif -+#endif - - /* ---- System specific configurations ----------------------------------- */ - -diff -up libffi-3.0.9/src/sparc/ffitarget.h.defines libffi-3.0.9/src/sparc/ffitarget.h ---- libffi-3.0.9/src/sparc/ffitarget.h.defines 2010-07-03 22:28:09.000000000 +0200 -+++ libffi-3.0.9/src/sparc/ffitarget.h 2010-07-03 22:28:23.000000000 +0200 -@@ -30,8 +30,10 @@ - /* ---- System specific configurations ----------------------------------- */ - - #if defined(__arch64__) || defined(__sparcv9) -+#ifndef SPARC64 - #define SPARC64 - #endif -+#endif - - #ifndef LIBFFI_ASM - typedef unsigned long ffi_arg; diff --git a/libffi.spec b/libffi.spec index 42b9ea1..6b4fb59 100644 --- a/libffi.spec +++ b/libffi.spec @@ -1,5 +1,5 @@ Name: libffi -Version: 3.0.9 +Version: 3.0.10 Release: 3%{?dist} Summary: A portable foreign function interface library @@ -8,7 +8,6 @@ License: BSD URL: http://sourceware.org/libffi Source0: http://sourceware.org/libffi/libffi-%{version}.tar.gz # part of upstream commit 5feacad4 -Patch0: %{name}-3.0.9-defines.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -54,7 +53,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .defines %build @@ -100,6 +98,9 @@ fi %{_infodir}/libffi.info.gz %changelog +* Tue Aug 23 2011 Anthony Green - 3.0.10-1 +- Upgrade to 3.0.10. + * Fri Mar 18 2011 Dan HorĂ¡k - 3.0.9-3 - added patch for being careful when defining relatively generic symbols diff --git a/sources b/sources index e2f3cb9..3c3109f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f300a7a7f975d4046f51c3022fa5ff1 libffi-3.0.9.tar.gz +79390673f5d07a8fb342bc09b5055b6f libffi-3.0.10.tar.gz