rpms/g-wrap/devel g-wrap-1.9.11-libffi.patch, NONE, 1.1 g-wrap.spec, 1.49, 1.50
Michel Alexandre Salim
salimma at fedoraproject.org
Sun Dec 28 01:30:07 UTC 2008
Author: salimma
Update of /cvs/pkgs/rpms/g-wrap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24930
Modified Files:
g-wrap.spec
Added Files:
g-wrap-1.9.11-libffi.patch
Log Message:
* Sat Dec 27 2008 Michel Salim <salimma at fedoraproject.org> - 1.9.11-2
- Patch for incorrect pkgconfig template
g-wrap-1.9.11-libffi.patch:
--- NEW FILE g-wrap-1.9.11-libffi.patch ---
--- g-wrap-1.9.11/guile/g-wrap-2.0-guile.pc.in.libffi 2007-08-14 09:21:29.000000000 -0400
+++ g-wrap-1.9.11/guile/g-wrap-2.0-guile.pc.in 2008-12-27 19:02:49.000000000 -0500
@@ -11,5 +11,5 @@
Name: G-Wrap
Description: A Guile wrapper generator
Version: @VERSION@
-Libs: -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@ @LIBFFI_LIBS_INSTALLED@
-Cflags: @STD_CFLAGS@ -I${includedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS_INSTALLED@
+Libs: -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@ @LIBFFI_LIBS@
+Cflags: @STD_CFLAGS@ -I${includedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS@
Index: g-wrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- g-wrap.spec 26 Dec 2008 18:02:54 -0000 1.49
+++ g-wrap.spec 28 Dec 2008 01:29:37 -0000 1.50
@@ -1,15 +1,14 @@
Name: g-wrap
Version: 1.9.11
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A tool for creating Scheme interfaces to C libraries
Group: Development/Libraries
License: LGPLv2+
URL: http://www.nongnu.org/g-wrap
Source: http://savannah.nongnu.org/download/g-wrap/%{name}-%{version}.tar.gz
-#Patch1: g-wrap-ffiexecstack.patch
-Patch2: g-wrap-1.9.6-shaddup.patch
-#Patch3: g-wrap-1.9.8-staticffi.patch
+Patch0: g-wrap-1.9.6-shaddup.patch
+Patch1: g-wrap-1.9.11-libffi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: guile-devel, guile-lib, libffi-devel
@@ -47,15 +46,12 @@
%prep
%setup -q
-#disabled as they don't work with g-wrap-1.9.8
-#%patch1 -p1
-%patch2 -p1 -b .shaddup
-# The following will remove libffi.so.4 which others need
-#%patch3 -p1
+%patch0 -p1 -b .shaddup
+# https://savannah.nongnu.org/bugs/index.php?25187
+%patch1 -p1 -b .libffi
%build
-export CFLAGS="$RPM_OPT_FLAGS -fPIC `pkgconfig libffi --cflags`"
%configure --disable-static
#remove Rpath
@@ -127,6 +123,9 @@
%changelog
+* Sat Dec 27 2008 Michel Salim <salimma at fedoraproject.org> - 1.9.11-2
+- Patch for incorrect pkgconfig template
+
* Fri Dec 26 2008 Michel Salim <salimma at fedoraproject.org> - 1.9.11-1
- Update to 1.9.11
- Use system libffi (bug #433083)
More information about the fedora-extras-commits
mailing list