From 17cb667230aac02dd834cac0cfb524ae6c076742 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 12 Feb 2020 18:15:38 +0100 Subject: [PATCH] Drop libffi-3.1-fix-include-path.patch, it just breaks the pkgconfig file --- libffi-3.1-fix-include-path.patch | 17 ----------------- mingw-libffi.spec | 18 ++++++++---------- 2 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 libffi-3.1-fix-include-path.patch diff --git a/libffi-3.1-fix-include-path.patch b/libffi-3.1-fix-include-path.patch deleted file mode 100644 index 5a3b7a5..0000000 --- a/libffi-3.1-fix-include-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up libffi-3.1/libffi.pc.in.fixpath libffi-3.1/libffi.pc.in ---- libffi-3.1/libffi.pc.in.fixpath 2014-04-25 19:45:13.000000000 +0200 -+++ libffi-3.1/libffi.pc.in 2014-06-12 12:06:06.000000000 +0200 -@@ -1,11 +1,10 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ --toolexeclibdir=@toolexeclibdir@ --includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include -+includedir=@includedir@ - - Name: @PACKAGE_NAME@ - Description: Library supporting Foreign Function Interfaces - Version: @PACKAGE_VERSION@ --Libs: -L${toolexeclibdir} -lffi -+Libs: -L${libdir} -lffi - Cflags: -I${includedir} diff --git a/mingw-libffi.spec b/mingw-libffi.spec index 030f55e..d32f07b 100644 --- a/mingw-libffi.spec +++ b/mingw-libffi.spec @@ -2,17 +2,16 @@ Name: mingw-libffi Version: 3.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A portable foreign function interface library for MinGW License: BSD URL: http://sourceware.org/libffi Source0: ftp://sourceware.org/pub/libffi/libffi-%{version}.tar.gz -Patch0: libffi-3.1-fix-include-path.patch -Patch1: libffi-3.1-fix-exec-stack.patch -Patch2: libffi-aarch64-rhbz1174037.patch -Patch3: libffi-3.1-aarch64-fix-exec-stack.patch +Patch0: libffi-3.1-fix-exec-stack.patch +Patch1: libffi-aarch64-rhbz1174037.patch +Patch2: libffi-3.1-aarch64-fix-exec-stack.patch BuildArch: noarch @@ -63,11 +62,7 @@ Foreign function interface static library for MinGW. %prep -%setup -q -n libffi-%{version} -%patch0 -p1 -b .fixpath -%patch1 -p1 -b .execstack -%patch2 -p1 -b .aarch64 -%patch3 -p1 -b .aarch64execstack +%autosetup -p1 -n libffi-%{version} %build %mingw_configure --enable-shared @@ -110,6 +105,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Wed Feb 12 2020 Sandro Mani - 3.1-9 +- Drop libffi-3.1-fix-include-path.patch, it just breaks the pkgconfig file + * Wed Jan 29 2020 Fedora Release Engineering - 3.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild