Upgrade to libffi 3.1.

.gitignore

@@ -2,3 +2,4 @@ libffi-3.0.9.tar.gz
 /libffi-3.0.10.tar.gz
 /libffi-3.0.11.tar.gz
 /libffi-3.0.13.tar.gz
+/libffi-3.1.tar.gz

libffi-3.0.13-fix-include-path.patch

@@ -1,34 +0,0 @@
-diff -up libffi-3.0.13/include/Makefile.am.fixpath libffi-3.0.13/include/Makefile.am
---- libffi-3.0.13/include/Makefile.am.fixpath	2013-05-25 22:11:25.983889342 -0400
-+++ libffi-3.0.13/include/Makefile.am	2013-05-25 22:12:12.337890037 -0400
-@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
- DISTCLEANFILES=ffitarget.h
- EXTRA_DIST=ffi.h.in ffi_common.h
- 
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includesdir = $(includedir)/
- nodist_includes_HEADERS = ffi.h ffitarget.h
-diff -up libffi-3.0.13/include/Makefile.in.fixpath libffi-3.0.13/include/Makefile.in
---- libffi-3.0.13/include/Makefile.in.fixpath	2013-05-25 22:12:56.259890696 -0400
-+++ libffi-3.0.13/include/Makefile.in	2013-05-25 22:13:12.101890934 -0400
-@@ -250,7 +250,7 @@ top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign
- DISTCLEANFILES = ffitarget.h
- EXTRA_DIST = ffi.h.in ffi_common.h
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includesdir = $(includedir)/
- nodist_includes_HEADERS = ffi.h ffitarget.h
- all: all-am
- 
-diff -up libffi-3.0.13/libffi.pc.in.fixpath libffi-3.0.13/libffi.pc.in
---- libffi-3.0.13/libffi.pc.in.fixpath	2013-05-25 22:14:21.037891968 -0400
-+++ libffi-3.0.13/libffi.pc.in	2013-05-25 22:14:31.652892128 -0400
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includedir=@includedir@
- 
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces

libffi-3.1-fix-include-path.patch

@@ -0,0 +1,11 @@
+--- libffi.pc.in~	2014-04-25 13:45:13.000000000 -0400
++++ libffi.pc.in	2014-05-19 12:58:22.354885178 -0400
+@@ -2,7 +2,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ toolexeclibdir=@toolexeclibdir@
+-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includedir=${libdir}/@includedir@
+ 
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces

libffi.spec

@@ -1,8 +1,8 @@
 %global multilib_arches %{ix86} ppc %{power64} s390 s390x x86_64
 
 Name:		libffi
-Version:	3.0.13
+Version:	3.1
-Release:	5%{?dist}
+Release:	0%{?dist}
 Summary:	A portable foreign function interface library
 
 Group:		System Environment/Libraries
@@ -12,7 +12,7 @@ Source0:	ftp://sourceware.org/pub/libffi/libffi-%{version}.tar.gz
 # part of upstream commit 5feacad4
 Source1:	ffi-multilib.h
 Source2:	ffitarget-multilib.h
-Patch0:		libffi-3.0.13-fix-include-path.patch
+Patch0:		libffi-3.1-fix-include-path.patch
 # part of upstream commit 5feacad4
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,7 +59,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixpath
+%patch0 -p0 -b .fixpath
 
 
 %build
@@ -83,8 +83,9 @@ basearch=i386
 # Do header file switcheroo to avoid file conflicts on systems where you
 # can have both a 32- and 64-bit version of the library, and they each need
 # their own correct-but-different versions of the headers to be usable.
+mkdir -p $RPM_BUILD_ROOT%{_includedir}
 for i in ffi ffitarget; do
-  mv $RPM_BUILD_ROOT%{_includedir}/$i.h $RPM_BUILD_ROOT%{_includedir}/$i-${basearch}.h
+  mv $RPM_BUILD_ROOT%{_libdir}/libffi-%{version}/include/$i.h $RPM_BUILD_ROOT%{_includedir}/$i-${basearch}.h
 done
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/ffi.h
 install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/ffitarget.h
@@ -122,6 +123,9 @@ fi
 %{_infodir}/libffi.info.gz
 
 %changelog
+* Mon May 19 2014 Anthony Green <green@redhat.com> - 3.1-0
+- update to 3.1.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.13-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

sources

@@ -1 +1 @@
-45f3b6dbc9ee7c7dfbbbc5feba571529  libffi-3.0.13.tar.gz
+f5898b29bbfd70502831a212d9249d10  libffi-3.1.tar.gz