rpms/g-wrap/devel g-wrap-consistent.patch, NONE, 1.1 g-wrap.spec, 1.23, 1.24

[fedora-cvs-commits at redhat.com]

Author: notting

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

Modified Files:
	g-wrap.spec 
Added Files:
	g-wrap-consistent.patch 
Log Message:
g-wrap checks for srfi-{34,35}, and will build them if it's not found.

Which means, of course, that the filelist will change depending on
whether or not previously-built g-wrap is installed.

So, force it to check for something that it shouldn't find.


g-wrap-consistent.patch:
 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE g-wrap-consistent.patch ---
--- g-wrap-1.9.6/configure.ac.foo	2006-02-27 22:23:25.000000000 -0500
+++ g-wrap-1.9.6/configure.ac	2006-02-27 22:28:41.000000000 -0500
@@ -88,8 +88,8 @@
 dnl Guile
 GUILE_FLAGS
 
-GUILE_MODULE_AVAILABLE(HAVE_SRFI_34, [(srfi srfi-34)])
-GUILE_MODULE_AVAILABLE(HAVE_SRFI_35, [(srfi srfi-35)])
+GUILE_MODULE_AVAILABLE(HAVE_SRFI_34, [(srfi srfi-sdfdsfdsfsf34)])
+GUILE_MODULE_AVAILABLE(HAVE_SRFI_35, [(srfi srfi-sdfdsfsfdsf35)])
 
 AM_CONDITIONAL(HAVE_SRFI_34, test "$HAVE_SRFI_34" = yes)
 AM_CONDITIONAL(HAVE_SRFI_35, test "$HAVE_SRFI_35" = yes)


Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- g-wrap.spec	28 Feb 2006 03:10:16 -0000	1.23
+++ g-wrap.spec	28 Feb 2006 03:33:04 -0000	1.24
@@ -13,7 +13,8 @@
 Patch1: g-wrap-glib2.patch
 Patch2: g-wrap-staticffi.patch
 Patch3: g-wrap-ffiexecstack.patch
-BuildPrereq: guile-devel slib glib-devel pkgconfig
+Patch4: g-wrap-consistent.patch
+BuildPrereq: guile-devel slib glib-devel pkgconfig autoconf
 
 %description
 This is a tool for specifying types, functions, and constants to
@@ -43,8 +44,10 @@
 #%patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %build
 
+autoconf
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 %configure --disable-static
 make