[packages/libffi] - updated to 3.3 (note: new soname) - updated info,libdir patches - removed obsolete includedir patc

qboosh qboosh at pld-linux.org
Sun Feb 9 08:37:57 CET 2020


commit 99e66a4266b9683a3047b48f63722ad67364d493
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 9 08:38:21 2020 +0100

    - updated to 3.3 (note: new soname)
    - updated info,libdir patches
    - removed obsolete includedir patch

 libffi-includedir.patch | 34 ----------------------------------
 libffi-info.patch       | 12 ++++++------
 libffi-libdir.patch     | 20 ++++++++++----------
 libffi.spec             | 14 ++++++--------
 4 files changed, 22 insertions(+), 58 deletions(-)
---
diff --git a/libffi.spec b/libffi.spec
index 58d55f4..6200fff 100644
--- a/libffi.spec
+++ b/libffi.spec
@@ -5,17 +5,16 @@
 Summary:	Foreign Function Interface library
 Summary(pl.UTF-8):	Biblioteka Foreign Function Interface
 Name:		libffi
-Version:	3.2.1
-Release:	4
+Version:	3.3
+Release:	1
 Epoch:		7
 License:	MIT-like
 Group:		Libraries
 Source0:	ftp://sourceware.org/pub/libffi/%{name}-%{version}.tar.gz
-# Source0-md5:	83b89587607e3eb65c70d361f13bab43
+# Source0-md5:	6313289e32f1d38a9df4770b014a2ca7
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-libdir.patch
-Patch2:		%{name}-includedir.patch
-URL:		http://sources.redhat.com/libffi/
+URL:		http://www.sourceware.org/libffi/
 BuildRequires:	autoconf >= 2.68
 BuildRequires:	automake
 BuildRequires:	libltdl-devel
@@ -78,7 +77,6 @@ Statyczna wersja biblioteki libffi.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -111,9 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog* LICENSE README
+%doc ChangeLog* LICENSE README.md
 %attr(755,root,root) %{_libdir}/libffi.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libffi.so.6
+%attr(755,root,root) %ghost %{_libdir}/libffi.so.7
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/libffi-includedir.patch b/libffi-includedir.patch
deleted file mode 100644
index a985398..0000000
--- a/libffi-includedir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
diff --git a/libffi-info.patch b/libffi-info.patch
index 91695b3..a77a731 100644
--- a/libffi-info.patch
+++ b/libffi-info.patch
@@ -1,14 +1,14 @@
---- libffi-3.0.9/doc/libffi.texi.orig	2009-12-29 16:22:26.000000000 +0100
-+++ libffi-3.0.9/doc/libffi.texi	2010-03-25 07:44:51.098705217 +0100
-@@ -31,9 +31,9 @@
- @end quotation
+--- libffi-3.3/doc/libffi.texi.orig	2020-02-09 08:11:06.755529478 +0100
++++ libffi-3.3/doc/libffi.texi	2020-02-09 08:11:46.371981524 +0100
+@@ -41,9 +41,9 @@
+ 
  @end copying
  
 - at dircategory Development
 + at dircategory Libraries:
  @direntry
--* libffi: (libffi).             Portable foreign-function interface library.
-+* libffi: (libffi).			Portable foreign-function interface library
+-* libffi: (libffi).             Portable foreign function interface library.
++* libffi: (libffi).			Portable foreign function interface library
  @end direntry
  
  @titlepage
diff --git a/libffi-libdir.patch b/libffi-libdir.patch
index 64932d8..6a3f21c 100644
--- a/libffi-libdir.patch
+++ b/libffi-libdir.patch
@@ -1,11 +1,11 @@
---- libffi-3.2.1/configure.ac.orig	2014-11-12 12:56:51.000000000 +0100
-+++ libffi-3.2.1/configure.ac	2014-12-09 19:45:15.750254077 +0100
-@@ -604,7 +604,7 @@
-   multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
-   case $multi_os_directory in
-     .) ;; # Avoid trailing /.
--    ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
-+    ../*) toolexeclibdir=$(dirname $toolexeclibdir)/${multi_os_directory#../} ;;
-   esac
+--- libffi-3.3/configure.ac.orig	2020-02-09 08:12:33.621725550 +0100
++++ libffi-3.3/configure.ac	2020-02-09 08:14:51.227646741 +0100
+@@ -367,7 +367,7 @@
+     multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
+     case $multi_os_directory in
+       .) ;; # Avoid trailing /.
+-      ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
++      ../*) toolexeclibdir=$(dirname $toolexeclibdir)/${multi_os_directory#../} ;;
+     esac
+   fi
    AC_SUBST(toolexecdir)
- else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libffi.git/commitdiff/99e66a4266b9683a3047b48f63722ad67364d493



More information about the pld-cvs-commit mailing list