[libffi/f19] fix include path (and .pc file). resolves bz727301
Tom Callaway
spot at fedoraproject.org
Sun May 26 02:18:58 UTC 2013
commit 70e8154f14c9799d4245d2a4e0f3aade1fc0af4e
Author: Tom Callaway <spot at fedoraproject.org>
Date: Sat May 25 22:18:38 2013 -0400
fix include path (and .pc file). resolves bz727301
libffi-3.0.13-fix-include-path.patch | 34 ++++++++++++++++++++++++++++++++++
libffi.spec | 12 +++++++++---
2 files changed, 43 insertions(+), 3 deletions(-)
---
diff --git a/libffi-3.0.13-fix-include-path.patch b/libffi-3.0.13-fix-include-path.patch
new file mode 100644
index 0000000..4502333
--- /dev/null
+++ b/libffi-3.0.13-fix-include-path.patch
@@ -0,0 +1,34 @@
+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 at -@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 at -@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 at -@PACKAGE_VERSION@/include
++includedir=@includedir@
+
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
diff --git a/libffi.spec b/libffi.spec
index f363863..77d0a01 100644
--- a/libffi.spec
+++ b/libffi.spec
@@ -1,6 +1,6 @@
Name: libffi
Version: 3.0.13
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A portable foreign function interface library
Group: System Environment/Libraries
@@ -8,6 +8,8 @@ License: BSD
URL: http://sourceware.org/libffi
Source0: ftp://sourceware.org/pub/libffi/libffi-%{version}.tar.gz
# part of upstream commit 5feacad4
+Patch0: libffi-3.0.13-fix-include-path.patch
+# part of upstream commit 5feacad4
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -53,6 +55,7 @@ developing applications that use %{name}.
%prep
%setup -q
+%patch0 -p1 -b .fixpath
%build
@@ -92,13 +95,16 @@ fi
%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/*.pc
-%{_libdir}/%{name}-%{version}
+%{_includedir}/ffi*.h
%{_libdir}/*.so
%{_mandir}/man3/*.gz
%{_infodir}/libffi.info.gz
%changelog
-* Fri Mar 22 2013 Anthony Green <green at redhat.com> - 3.0.13-1
+* Sat May 25 2013 Tom Callaway <spot at fedoraproject.org> - 3.0.13-2
+- fix incorrect header pathing (and .pc file)
+
+* Wed Mar 20 2013 Anthony Green <green at redhat.com> - 3.0.13-1
- update to 3.0.13
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.11-2
More information about the scm-commits
mailing list