rpms/gnu-smalltalk/devel gnu-smalltalk.spec, 1.37, 1.38 gst-3.0.2-am.patch, 1.1, 1.2

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/gnu-smalltalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22797

Modified Files:
	gnu-smalltalk.spec gst-3.0.2-am.patch 
Log Message:
Make package indep from libffi version


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnu-smalltalk.spec	9 Apr 2008 14:14:10 -0000	1.37
+++ gnu-smalltalk.spec	17 Apr 2008 18:28:03 -0000	1.38
@@ -1,9 +1,7 @@
-%define libffiver 3.0.1
-
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
 Version: 3.0.2
-Release: 2%{?dist}
+Release: 4%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
 Patch1: gst-3.0.2-am.patch
 Patch2: gst-3.0-tst117.patch
@@ -31,7 +29,8 @@
 BuildRequires: libsigsegv-devel
 BuildRequires: mysql-devel
 BuildRequires: sqlite-devel
-BuildRequires: libffi-devel = %{libffiver}
+BuildRequires: libffi-devel
+BuildRequires: pkgconfig
 
 %description
 GNU Smalltalk is an implementation that closely follows the
@@ -81,8 +80,7 @@
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} \
   --enable-static=no --enable-shared=yes --disable-rpath \
   --with-system-libsigsegv \
-  --disable-general-gc \
-  --with-system-libffi=%{_libdir}/libffi-%{libffiver} \
+  --with-system-libffi=yes \
   --with-imagedir=%{_libdir}/%{name}
 
 # _smp_mflags seems not to work
@@ -179,6 +177,9 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
+* Thu Apr 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.2-4
+- Patch configure.ac to make version independency from libffi
+
 * Sat Mar 08 2008 Xavier Lamien <lxtnow[at]gmail.com> 3.0.2-2
 - Updated release.
 - Disable x86_64 arch, because 'make test' fails on this arch

gst-3.0.2-am.patch:

Index: gst-3.0.2-am.patch
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gst-3.0.2-am.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gst-3.0.2-am.patch	9 Apr 2008 14:14:10 -0000	1.1
+++ gst-3.0.2-am.patch	17 Apr 2008 18:28:03 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up smalltalk-3.0.2/configure.ac.auto smalltalk-3.0.2/configure.ac
 --- smalltalk-3.0.2/configure.ac.auto	2008-03-07 11:53:43.000000000 +0100
-+++ smalltalk-3.0.2/configure.ac	2008-03-13 19:22:40.000000000 +0100
++++ smalltalk-3.0.2/configure.ac	2008-04-17 17:39:51.000000000 +0200
 @@ -7,7 +7,7 @@ dnl with this software.
  dnl Process this file with autoconf to produce a configure script.
  
@@ -10,7 +10,7 @@
  MAINTAINER="bonzini at gnu.org"
  
  dnl CURRENT:REVISION:AGE means this is the REVISION-th version of
-@@ -72,7 +72,21 @@ AM_MISSING_PROG(AUTOM4TE, autom4te, $mis
+@@ -72,7 +72,22 @@ AM_MISSING_PROG(AUTOM4TE, autom4te, $mis
  dnl 
  dnl ------------------------------ SUBDIRS --------------------
  
@@ -24,7 +24,8 @@
 +  INCFFI='-I$(top_srcdir)/libffi/include -I$(top_builddir)/libffi/include'
 +  LIBFFI='$(top_builddir)/libffi/libffi.la'
 +elif test $with_system_libffi = yes; then
-+  INCFFI= LIBFFI=-lffi
++  INCFFI=$(pkg-config --cflags libffi)
++  LIBFFI=$(pkg-config --libs libffi)
 +else
 +  INCFFI="-I$withval/include" LIBFFI="-L$withval -lffi"
 +fi
@@ -33,7 +34,7 @@
  
  case $ac_configure_args in
    *--enable-subdir) ;;
-@@ -87,12 +101,27 @@ AC_ARG_ENABLE(generational-gc,
+@@ -87,12 +102,27 @@ AC_ARG_ENABLE(generational-gc,
          *-*-cygwin* | *-*-mingw* | ia64-*-* ) enable_generational_gc=no ;;
          *) enable_generational_gc=yes ;;
  esac])
@@ -68,7 +69,7 @@
  [  --with-imagedir=PATH   path where to place the system image
 diff -up smalltalk-3.0.2/libgst/Makefile.am.auto smalltalk-3.0.2/libgst/Makefile.am
 --- smalltalk-3.0.2/libgst/Makefile.am.auto	2008-03-07 11:53:44.000000000 +0100
-+++ smalltalk-3.0.2/libgst/Makefile.am	2008-03-13 19:13:27.000000000 +0100
++++ smalltalk-3.0.2/libgst/Makefile.am	2008-04-17 17:32:04.000000000 +0200
 @@ -7,19 +7,14 @@ AM_YFLAGS = -vy
  AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \
    -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(pkglibdir)\" \