rpms/gnu-smalltalk/devel gnu-smalltlak-3.0.2-am.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 gnu-smalltalk.spec, 1.34, 1.35 sources, 1.10, 1.11

Xavier LAMIEN (laxathom) fedora-extras-commits at redhat.com
Sat Mar 8 21:53:42 UTC 2008


Author: laxathom

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

Modified Files:
	.cvsignore gnu-smalltalk.spec sources 
Added Files:
	gnu-smalltlak-3.0.2-am.patch 
Log Message:
updating files against new release

gnu-smalltlak-3.0.2-am.patch:

--- NEW FILE gnu-smalltlak-3.0.2-am.patch ---
diff -up smalltalk-3.0.2/configure.ac.false smalltalk-3.0.2/configure.ac
--- smalltalk-3.0.2/configure.ac.false	2008-03-08 22:21:23.000000000 +0100
+++ smalltalk-3.0.2/configure.ac	2008-03-08 22:23:10.000000000 +0100
@@ -7,7 +7,7 @@ dnl with this software.
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.60)
-AC_INIT([GNU Smalltalk], 3.0.2, help-smalltalk at gnu.org, smalltalk)
+AC_INIT([GNU Smalltalk], 3.0.2, help-smalltalk at gnu.org, gnu-smalltalk)
 MAINTAINER="bonzini at gnu.org"
 
 dnl CURRENT:REVISION:AGE means this is the REVISION-th version of
@@ -72,7 +72,6 @@ AM_MISSING_PROG(AUTOM4TE, autom4te, $mis
 dnl 
 dnl ------------------------------ SUBDIRS --------------------
 
-AC_CONFIG_SUBDIRS(libffi)
 
 case $ac_configure_args in
   *--enable-subdir) ;;
@@ -88,7 +87,6 @@ AC_ARG_ENABLE(generational-gc,
         *) enable_generational_gc=yes ;;
 esac])
 if test $enable_generational_gc != no; then
-  AC_CONFIG_SUBDIRS(sigsegv)
   AC_DEFINE(HAVE_SIGSEGV_H, 1,
     [Define to 1 if libsigsegv is being used])
 fi
diff -up smalltalk-3.0.2/Makefile.am.false smalltalk-3.0.2/Makefile.am
--- smalltalk-3.0.2/Makefile.am.false	2008-03-08 22:34:26.000000000 +0100
+++ smalltalk-3.0.2/Makefile.am	2008-03-08 22:36:39.000000000 +0100
@@ -19,10 +19,10 @@
 AUTOMAKE_OPTIONS = gnu 1.8
 ACLOCAL_AMFLAGS = -I build-aux
 
-PACKAGE=smalltalk
-gstdatadir=$(pkgdatadir)
+PACKAGE=gnu-smalltalk
+gstdatadir=$(libdir)/@PACKAGE@
 
-DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \
+DIST_SUBDIRS = lib-src snprintfv lightning opcode libgst \
 	. $(ALL_PACKAGES) tests doc
 
 SUBDIRS = lib-src lightning $(subdirs)
@@ -57,6 +57,7 @@ dist_noinst_SCRIPTS = build-aux/texi2dvi
 ###########################################################
 
 pkgconfigdir = $(libdir)/pkgconfig
+imagedir = ${libdir}/@PACKAGE@
 nodist_pkgconfig_DATA = gnu-smalltalk.pc
 
 pkglib_DATA = libc.la
diff -up smalltalk-3.0.2/libgst/Makefile.am.false smalltalk-3.0.2/libgst/Makefile.am
--- smalltalk-3.0.2/libgst/Makefile.am.false	2008-03-08 22:23:57.000000000 +0100
+++ smalltalk-3.0.2/libgst/Makefile.am	2008-03-08 22:28:47.000000000 +0100
@@ -1,5 +1,7 @@
 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 +9,9 @@ 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 $(LIBFFI_INCLUDES) \
+  $(INCLIGHTNING) \
+
   @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src
 
 if !HAVE_INSTALLED_LIGHTNING
@@ -16,9 +19,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/lightning
   -I$(top_srcdir) -I$(top_builddir)
 endif
 
-if HAVE_SIGSEGV
-AM_CPPFLAGS += -I$(top_srcdir)/sigsegv/src -I$(top_builddir)/sigsegv/src
-endif
 
 include_HEADERS = gstpub.h gst.h
 lib_LTLIBRARIES = libgst.la
@@ -28,15 +28,11 @@ CLEANFILES = genprims$(EXEEXT) genbc$(EX
 # definitions for libgst.la
 
 libgst_la_LIBADD=$(top_builddir)/lib-src/library.la \
-	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@ @LIBREADLINE@ @LIBGMP@
+	-lffi @LIBSNPRINTFV@ @LIBREADLINE@ @LIBGMP@
 
 libgst_la_DEPENDENCIES=$(top_builddir)/lib-src/library.la \
-	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@
+	@LIBSNPRINTFV@
 
-if HAVE_SIGSEGV
-libgst_la_LIBADD += $(top_builddir)/sigsegv/src/libsigsegv.la
-libgst_la_DEPENDENCIES += $(top_builddir)/sigsegv/src/libsigsegv.la
-endif
 
 libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \
 	-export-symbols-regex "^gst_.*"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnu-smalltalk/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Sep 2007 19:36:36 -0000	1.8
+++ .cvsignore	8 Mar 2008 21:53:09 -0000	1.9
@@ -1 +1 @@
-smalltalk-2.3.6.tar.gz
+smalltalk-3.0.2.tar.gz


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnu-smalltalk.spec	17 Feb 2008 20:26:57 -0000	1.34
+++ gnu-smalltalk.spec	8 Mar 2008 21:53:09 -0000	1.35
@@ -1,9 +1,9 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
-Version: 3.0.1
-Release: 3%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
-Patch1: gst-3.0.1-am.patch
+Patch1: gnu-smalltalk-3.0.2-am.patch
 Patch2: gst-3.0-tst117.patch
 Patch3: gst-3.0.1-ffi.patch
 License: GPLv2
@@ -173,6 +173,9 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
+* Sat Mar 08 2008 Xavier Lamien <lxtnow[at]gmail.com> - 3.0.2-1
+- Updated release.
+
 * Sun Feb 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0.1-3
 - Use system libffi
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnu-smalltalk/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Feb 2008 20:45:28 -0000	1.10
+++ sources	8 Mar 2008 21:53:09 -0000	1.11
@@ -1 +1 @@
-dbd1bc308dda3a4ef936dce2b78faa5a  smalltalk-3.0.1.tar.gz
+2c471da97c8a174d9b0f6586555ebb0c  smalltalk-3.0.2.tar.gz




More information about the fedora-extras-commits mailing list