rpms/gnu-smalltalk/devel gnu-smalltalk.spec, 1.33, 1.34 gst-3.0.1-am.patch, 1.1, 1.2

Sun Feb 17 20:27:35 UTC 2008

Author: s4504kr

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

Modified Files:
	gnu-smalltalk.spec gst-3.0.1-am.patch 
Log Message:
Use system libffi for rawhide


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34

--- gnu-smalltalk.spec	17 Feb 2008 20:04:39 -0000	1.33
+++ gnu-smalltalk.spec	17 Feb 2008 20:26:57 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
 Version: 3.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
 Patch1: gst-3.0.1-am.patch
 Patch2: gst-3.0-tst117.patch
@@ -173,7 +173,7 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
-* Sun Feb 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.1-2
+* Sun Feb 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.1-3
 - Use system libffi
 
 * Sun Feb 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.1-1

gst-3.0.1-am.patch:

Index: gst-3.0.1-am.patch
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gst-3.0.1-am.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gst-3.0.1-am.patch	17 Feb 2008 20:04:39 -0000	1.1
+++ gst-3.0.1-am.patch	17 Feb 2008 20:26:57 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up smalltalk-3.0.1/configure.ac.auto smalltalk-3.0.1/configure.ac
 --- smalltalk-3.0.1/configure.ac.auto	2008-01-31 15:40:28.000000000 +0100
-+++ smalltalk-3.0.1/configure.ac	2008-02-17 20:29:31.000000000 +0100
++++ smalltalk-3.0.1/configure.ac	2008-02-17 20:35:57.000000000 +0100
 @@ -7,7 +7,7 @@ dnl with this software.
  dnl Process this file with autoconf to produce a configure script.
  
@@ -29,19 +29,28 @@
  fi
 diff -up smalltalk-3.0.1/libgst/Makefile.am.auto smalltalk-3.0.1/libgst/Makefile.am
 --- smalltalk-3.0.1/libgst/Makefile.am.auto	2008-01-22 11:14:32.000000000 +0100
-+++ smalltalk-3.0.1/libgst/Makefile.am	2008-02-17 20:35:29.000000000 +0100
-@@ -7,8 +7,8 @@ AM_YFLAGS = -vy
++++ smalltalk-3.0.1/libgst/Makefile.am	2008-02-17 21:22:27.000000000 +0100
+@@ -1,5 +1,8 @@
+ LIBTOOL += --tag=LIBGST
+ 
++LIBFFI_INCLUDES = `pkg-config libffi --cflags`
++LIBFFI_LIBS     = `pkg-config libffi --libs`
++
+ LEX_OUTPUT_ROOT = lex.yy
+ ## CFLAGS=-O0 -g
+ AM_LFLAGS = -Cfe -o$(LEX_OUTPUT_ROOT).c
+@@ -7,8 +10,8 @@ AM_YFLAGS = -vy
  AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \
    -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(pkglibdir)\" \
    -DLIBEXEC_PATH=\"$(libexecdir)/$(PACKAGE)\" \
 -  -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \
 -  -I$(top_builddir)/libffi/include $(INCLIGHTNING) \
-+  -I$(top_srcdir)/lib-src -I$(libdir)/libffi-3.0.1/include \
++  -I$(top_srcdir)/lib-src $(LIBFFI_INCLUDES) \
 +  $(INCLIGHTNING) \
    @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src
  
  if !HAVE_INSTALLED_LIGHTNING
-@@ -16,10 +16,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/lightning
+@@ -16,10 +19,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/lightning
    -I$(top_srcdir) -I$(top_builddir)
  endif
  
@@ -52,7 +61,7 @@
  include_HEADERS = gstpub.h gst.h
  lib_LTLIBRARIES = libgst.la
  EXTRA_PROGRAMS = genprims genbc genvm
-@@ -28,15 +24,11 @@ CLEANFILES = genprims$(EXEEXT) genbc$(EX
+@@ -28,15 +27,11 @@ CLEANFILES = genprims$(EXEEXT) genbc$(EX
  # definitions for libgst.la
  
  libgst_la_LIBADD=$(top_builddir)/lib-src/library.la \
@@ -72,7 +81,7 @@
  	-export-symbols-regex "^gst_.*"
 diff -up smalltalk-3.0.1/Makefile.am.auto smalltalk-3.0.1/Makefile.am
 --- smalltalk-3.0.1/Makefile.am.auto	2008-01-24 13:21:21.000000000 +0100
-+++ smalltalk-3.0.1/Makefile.am	2008-02-17 20:29:31.000000000 +0100
++++ smalltalk-3.0.1/Makefile.am	2008-02-17 20:35:57.000000000 +0100
 @@ -19,10 +19,10 @@
  AUTOMAKE_OPTIONS = gnu 1.8
  ACLOCAL_AMFLAGS = -I build-aux


