[packages/libffi] upstream patch to fix include files location; rel 4

[atler]

commit 97a86a08faf9ee8498fcef944d93e88954a3d1b4
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Sep 17 23:38:42 2018 +0200

    upstream patch to fix include files location; rel 4

 libffi-includedir.patch | 34 ++++++++++++++++++++++++++++++++++
 libffi.spec             |  8 +++++---
 2 files changed, 39 insertions(+), 3 deletions(-)
---
diff --git a/libffi.spec b/libffi.spec
index 7647c68..58d55f4 100644
--- a/libffi.spec
+++ b/libffi.spec
@@ -6,7 +6,7 @@ Summary:	Foreign Function Interface library
 Summary(pl.UTF-8):	Biblioteka Foreign Function Interface
 Name:		libffi
 Version:	3.2.1
-Release:	3
+Release:	4
 Epoch:		7
 License:	MIT-like
 Group:		Libraries
@@ -14,11 +14,12 @@ Source0:	ftp://sourceware.org/pub/libffi/%{name}-%{version}.tar.gz
 # Source0-md5:	83b89587607e3eb65c70d361f13bab43
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-libdir.patch
+Patch2:		%{name}-includedir.patch
 URL:		http://sources.redhat.com/libffi/
 BuildRequires:	autoconf >= 2.68
 BuildRequires:	automake
-BuildRequires:	libtool
 BuildRequires:	libltdl-devel
+BuildRequires:	libtool
 BuildRequires:	texinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -77,6 +78,7 @@ Statyczna wersja biblioteki libffi.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -117,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libffi.so
 %{_libdir}/libffi.la
-%{_libdir}/libffi-%{version}
+%{_includedir}/ffi*.h
 %{_pkgconfigdir}/libffi.pc
 %{_mandir}/man3/ffi*.3*
 %{_infodir}/libffi.info*
diff --git a/libffi-includedir.patch b/libffi-includedir.patch
new file mode 100644
index 0000000..a985398
--- /dev/null
+++ b/libffi-includedir.patch
@@ -0,0 +1,34 @@
+From 982b89c01aca99c7bc229914fc1521f96930919b Mon Sep 17 00:00:00 2001
+From: Yen Chi Hsuan <yan12125 at gmail.com>
+Date: Sun, 13 Nov 2016 19:17:19 +0800
+Subject: [PATCH] Install public headers in the standard path
+
+---
+ include/Makefile.am | 3 +--
+ libffi.pc.in        | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/include/Makefile.am b/include/Makefile.am
+index bb241e88..c59df9fb 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -6,5 +6,4 @@ DISTCLEANFILES=ffitarget.h
+ noinst_HEADERS=ffi_common.h ffi_cfi.h
+ EXTRA_DIST=ffi.h.in
+ 
+-includesdir = $(libdir)/@PACKAGE_NAME at -@PACKAGE_VERSION@/include
+-nodist_includes_HEADERS = ffi.h ffitarget.h
++nodist_include_HEADERS = ffi.h ffitarget.h
+diff --git a/libffi.pc.in b/libffi.pc.in
+index edf6fde5..6fad83b4 100644
+--- a/libffi.pc.in
++++ b/libffi.pc.in
+@@ -2,7 +2,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ toolexeclibdir=@toolexeclibdir@
+-includedir=${libdir}/@PACKAGE_NAME at -@PACKAGE_VERSION@/include
++includedir=@includedir@
+ 
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libffi.git/commitdiff/97a86a08faf9ee8498fcef944d93e88954a3d1b4