diff --git a/libffi.spec b/libffi.spec index d566a43..b8fb1ef 100644 --- a/libffi.spec +++ b/libffi.spec @@ -23,7 +23,6 @@ Patch1: libffi-3.1-fix-exec-stack.patch Patch2: libffi-aarch64-rhbz1174037.patch Patch3: libffi-3.1-aarch64-fix-exec-stack.patch Patch4: libffi-3.1-libffi_tmpdir.patch -Patch5: libffi3.1-pkgconfig.patch %endif BuildRequires: make @@ -94,7 +93,6 @@ cd %{_builddir}/libffi-3.1 %patch2 -p1 -b .aarch64 %patch3 -p1 -b .aarch64execstack %patch4 -p1 -b .libffitmpdir -%patch5 -p1 -b .pkgconfig %endif %build @@ -186,6 +184,9 @@ install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/ffitarget.h %{_infodir}/libffi.info.* %changelog +* Thu Jul 29 2021 Carlos O'Donell - 3.4.2-4 +- Drop pkgconf support for compat-libffi3.1. + * Tue Jul 27 2021 Carlos O'Donell - 3.4.2-3 - Add temporary compat-libffi3.1 for library transition. diff --git a/libffi3.1-pkgconfig.patch b/libffi3.1-pkgconfig.patch deleted file mode 100644 index 644a893..0000000 --- a/libffi3.1-pkgconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rup a/libffi.pc.in b/libffi.pc.in ---- a/libffi.pc.in 2020-12-02 15:33:14.076549606 -0500 -+++ b/libffi.pc.in 2020-12-02 16:11:42.855654638 -0500 -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: @PACKAGE_NAME@ - Description: Library supporting Foreign Function Interfaces - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lffi -+Libs: -L${libdir} libffi.so.6 - Cflags: -I${includedir} -Only in b: libffi.pc.in~