rpms/g-wrap/devel g-wrap-staticffi.patch, NONE, 1.1 g-wrap.spec, 1.19, 1.20

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14679

Modified Files:
	g-wrap.spec 
Added Files:
	g-wrap-staticffi.patch 
Log Message:
ffi is an implementation detail - build it statically


g-wrap-staticffi.patch:
 configure |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE g-wrap-staticffi.patch ---
--- g-wrap-1.9.6/libffi/configure.foo	2006-02-20 13:42:58.000000000 -0500
+++ g-wrap-1.9.6/libffi/configure	2006-02-20 13:43:37.000000000 -0500
@@ -3287,6 +3287,7 @@
 else
   enable_shared=yes
 fi;
+enable_shared=no
 
 # Check whether --enable-static or --disable-static was given.
 if test "${enable_static+set}" = set; then
@@ -3311,6 +3312,7 @@
 else
   enable_static=yes
 fi;
+enable_static=yes
 
 # Check whether --enable-fast-install or --disable-fast-install was given.
 if test "${enable_fast_install+set}" = set; then


Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- g-wrap.spec	19 Feb 2006 05:45:44 -0000	1.19
+++ g-wrap.spec	20 Feb 2006 18:51:25 -0000	1.20
@@ -10,6 +10,7 @@
 Source: ftp://ftp.gnucash.org/pub/g-wrap/g-wrap-%{version}.tar.gz
 Patch0: g-wrap-info.patch
 Patch1: g-wrap-glib2.patch
+Patch2: g-wrap-staticffi.patch
 BuildPrereq: guile-devel slib glib-devel pkgconfig
 
 %description
@@ -38,7 +39,7 @@
 %setup -q
 %patch0 -p1
 #%patch1 -p1
-
+%patch2 -p1
 %build
 
 %configure --disable-static
@@ -52,7 +53,8 @@
 # them up, and remove the .so.
 
 mv %{buildroot}/%{_includedir}/ffi* %{buildroot}/%{_includedir}/g-wrap
-rm -f %{buildroot}/%{_libdir}/libffi.{so,la}
+
+rm -f %{buildroot}/%{_libdir}/libffi.*
 sed -i "s|-lffi||g" %{buildroot}/%{_libdir}/pkgconfig/*
 sed -i "s|<ffi|<g-wrap/ffi|g"  %{buildroot}/%{_includedir}/g-wrap/*.h
 sed -i "s|%{_libdir}/libffi.la||g" %{buildroot}/%{_libdir}/*.la