rpms/gnu-smalltalk/devel gst-3.0-am.patch, NONE, 1.1 gst-3.0-tst117.patch, NONE, 1.1 gnu-smalltalk.spec, 1.29, 1.30 gst-2.3.6-am.patch, 1.1, NONE

Jochen Schmitt (s4504kr) fedora-extras-commits at redhat.com
Tue Jan 15 18:00:53 UTC 2008


Author: s4504kr

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

Modified Files:
	gnu-smalltalk.spec 
Added Files:
	gst-3.0-am.patch gst-3.0-tst117.patch 
Removed Files:
	gst-2.3.6-am.patch 
Log Message:
New upstream release

gst-3.0-am.patch:

--- NEW FILE gst-3.0-am.patch ---
diff -up smalltalk-3.0/configure.ac.auto smalltalk-3.0/configure.ac
--- smalltalk-3.0/configure.ac.auto	2008-01-07 16:56:18.000000000 +0100
+++ smalltalk-3.0/configure.ac	2008-01-07 21:49:01.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, help-smalltalk at gnu.org, smalltalk)
+AC_INIT([GNU Smalltalk], 3.0, help-smalltalk at gnu.org, gnu-smalltalk)
 MAINTAINER="bonzini at gnu.org"
 
 dnl CURRENT:REVISION:AGE means this is the REVISION-th version of
@@ -88,7 +88,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/libgst/Makefile.am.auto smalltalk-3.0/libgst/Makefile.am
--- smalltalk-3.0/libgst/Makefile.am.auto	2007-07-10 15:39:42.000000000 +0200
+++ smalltalk-3.0/libgst/Makefile.am	2008-01-07 21:49:01.000000000 +0100
@@ -16,10 +16,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
 EXTRA_PROGRAMS = genprims genbc genvm
@@ -33,10 +29,6 @@ libgst_la_LIBADD=$(top_builddir)/lib-src
 libgst_la_DEPENDENCIES=$(top_builddir)/lib-src/library.la \
 	$(top_builddir)/libffi/libffi.la @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_.*"
diff -up smalltalk-3.0/Makefile.am.auto smalltalk-3.0/Makefile.am
--- smalltalk-3.0/Makefile.am.auto	2007-12-10 23:21:57.000000000 +0100
+++ smalltalk-3.0/Makefile.am	2008-01-07 21:56:07.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 libffi 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

gst-3.0-tst117.patch:

--- NEW FILE gst-3.0-tst117.patch ---
diff --git a/libgst/prims.def b/libgst/prims.def
index a243af4..7d92e3d 100644
--- a/libgst/prims.def
+++ b/libgst/prims.def
@@ -2204,16 +2204,17 @@ primitive VMpr_CompiledCode_verificationResult [succeed]
 /* CompiledBlock numArgs:numTemps:bytecodes:depth:literals: */
 primitive VMpr_CompiledBlock_create [succeed]
 {
-  OOP *_gst_literals = OOP_TO_OBJ (POP_OOP ())->data;
-  int depth = TO_INT (POP_OOP ());
-  OOP bytecodesOOP = POP_OOP ();
-  int blockTemps = TO_INT (POP_OOP ());
-  int blockArgs = TO_INT (POP_OOP ());
+  OOP *_gst_literals = OOP_TO_OBJ (STACK_AT (0))->data;
+  int depth = TO_INT (STACK_AT (1));
+  OOP bytecodesOOP = STACK_AT (2);
+  int blockTemps = TO_INT (STACK_AT (3));
+  int blockArgs = TO_INT (STACK_AT (4));
   bc_vector bytecodes = _gst_extract_bytecodes (bytecodesOOP);
 
   OOP block =
     _gst_block_new (blockArgs, blockTemps, bytecodes, depth, _gst_literals);
 
+  POP_N_OOPS (5);
   OOP_CLASS(block) = STACKTOP ();
 
   _gst_primitives_executed++;
@@ -2236,12 +2237,11 @@ primitive VMpr_CompiledMethod_create [succeed,fail]
   if (primitive == -1)
     PRIM_FAILED;
 
-  POP_N_OOPS(6);
-
   method = _gst_make_new_method (primitive, methodArgs, methodTemps, depth,
 			         literals, bytecodes, _gst_nil_oop,
 				 _gst_nil_oop, _gst_nil_oop, -1, -1);
 
+  POP_N_OOPS(6);
   OOP_CLASS(method) = STACKTOP ();
 
   _gst_primitives_executed++;
@@ -3914,22 +3914,21 @@ primitive VMpr_CObject_allocType [succeed,fail]
   OOP oop3;
   _gst_primitives_executed++;
 
-  oop1 = POP_OOP ();
-  oop2 = POP_OOP ();
-  oop3 = STACKTOP ();
+  oop1 = STACK_AT (0);
+  oop2 = STACK_AT (1);
+  oop3 = STACK_AT (2);
   if (IS_INT (oop2)
       && (IS_NIL (oop1) || is_a_kind_of (OOP_CLASS (oop1), _gst_c_type_class))
       && COMMON (RECEIVER_IS_A_KIND_OF (oop3, _gst_c_object_class)))
     {
-      intptr_t arg2;
-      PTR ptr;
-      arg2 = TO_INT (oop2);
-      ptr = xmalloc (arg2);
+      intptr_t arg2 = TO_INT (oop2);
+      PTR ptr = xmalloc (arg2);
+      OOP cObjectOOP = _gst_c_object_new (ptr, oop1, oop3);
 
-      SET_STACKTOP (_gst_c_object_new (ptr, oop1, oop3));
+      POP_N_OOPS (2);
+      SET_STACKTOP (cObjectOOP);
       PRIM_SUCCEEDED;
     }
-  UNPOP (2);
   PRIM_FAILED;
 }
 
@@ -4814,36 +4813,25 @@ primitive VMpr_String_ByteArray_asCData :
      prim_id VMpr_String_asCData [checks_receiver],
      prim_id VMpr_ByteArray_asCData [checks_receiver]
 {
-  PTR data;
-  int size;
   OOP oop1;
   OOP oop2;
   _gst_primitives_executed++;
 
-  oop2 = POP_OOP ();
-  oop1 = STACKTOP ();
-#ifndef OPTIMIZE
-  if ((IS_CLASS (oop1, _gst_string_class)
-       && id == prim_id (VMpr_String_asCData))
-      || (IS_CLASS (oop1, _gst_byte_array_class)
-	  && id == prim_id (VMpr_ByteArray_asCData)))
+  oop2 = STACK_AT (0);
+  oop1 = STACK_AT (1);
+  if (is_a_kind_of (OOP_CLASS (oop2), _gst_c_type_class))
     {
-#endif
-      if (is_a_kind_of (OOP_CLASS (oop2), _gst_c_type_class))
+      int size = NUM_INDEXABLE_FIELDS (oop1);
+      PTR data = xmalloc (size);
+      if (data)
 	{
-	  size = NUM_INDEXABLE_FIELDS (oop1);
-	  data = xmalloc (size);
-	  if (data)
-	    {
-	      memcpy (data, OOP_TO_OBJ (oop1)->data, size);
-	      SET_STACKTOP (_gst_c_object_new (data, oop2, _gst_c_object_class));
-	      PRIM_SUCCEEDED;
-	    }
+	  OOP cObjectOOP = _gst_c_object_new (data, oop2, _gst_c_object_class);
+	  memcpy (data, OOP_TO_OBJ (oop1)->data, size);
+	  POP_OOP ();
+	  SET_STACKTOP (cObjectOOP);
+	  PRIM_SUCCEEDED;
 	}
-#ifndef OPTIMIZE
     }
-#endif
-  UNPOP (1);
   PRIM_FAILED;
 }
 
@@ -5036,10 +5024,9 @@ primitive VMpr_CFuncDescriptor_create [succeed,fail]
   OOP oop4;
   _gst_primitives_executed++;
 
-  oop4 = POP_OOP ();
-  oop3 = POP_OOP ();
-  oop2 = POP_OOP ();
-  oop1 = POP_OOP ();
+  oop4 = STACK_AT (0);
+  oop3 = STACK_AT (1);
+  oop2 = STACK_AT (2);
 
   if (IS_CLASS (oop2, _gst_string_class)
       && (IS_CLASS (oop3, _gst_symbol_class)
@@ -5047,11 +5034,13 @@ primitive VMpr_CFuncDescriptor_create [succeed,fail]
       && (IS_CLASS (oop4, _gst_array_class)
 	  || IS_CLASS (oop4, _gst_undefined_object_class)))
     {
-      PUSH_OOP (_gst_make_descriptor (oop2, oop3, oop4));
+      OOP cFuncDescrOOP = _gst_make_descriptor (oop2, oop3, oop4);
+      POP_N_OOPS (3);
+      SET_STACKTOP (cFuncDescrOOP);
       PRIM_SUCCEEDED;
     }
-  UNPOP (4);
-  PRIM_FAILED;
+  else
+    PRIM_FAILED;
 }
 
 /* Object snapshot: aString */
@@ -5150,18 +5139,18 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
   OOP *oopVec = alloca (numArgs * sizeof (OOP));
   int i;
   intptr_t arg1;
+  OOP resultOOP;
 
   _gst_primitives_executed++;
 
   for (i = numArgs; --i >= 0;)
     oopVec[i] = POP_OOP ();
 
-  oop1 = STACKTOP ();
+  resultOOP = oop1 = STACKTOP ();
+  UNPOP (numArgs);
+
   if (!IS_INT (oopVec[0]))
-    {
-      UNPOP (numArgs);
-      PRIM_FAILED;
-    }
+    goto fail;
 
   arg1 = TO_INT (oopVec[0]);
   switch (arg1) {
@@ -5213,16 +5202,13 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 
       xfree (fileName);
       if (fd < 0)
-        {
-	  UNPOP (numArgs);
-	  PRIM_FAILED;
-        }
+	goto fail;
 
       _gst_set_file_stream_file (oop1, fd, oopVec[1],
 			         is_pipe, access, false);
-    }
 
-    PRIM_SUCCEEDED;
+      goto succeed;
+    }
 
   case PRIM_MK_TEMP:
     fileName = _gst_to_cstring (oopVec[1]);
@@ -5233,31 +5219,27 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
     if (fd < 0)
       {
         xfree (fileName2);
-	UNPOP (numArgs);
-	PRIM_FAILED;
+	goto fail;
       }
     
     _gst_set_file_stream_file (oop1, fd, _gst_string_new (fileName2),
 			       false, O_RDWR, false);
 
     xfree (fileName2);
-    PRIM_SUCCEEDED;
+    goto succeed;
   }
 
   fileStream = (gst_file_stream) OOP_TO_OBJ (oop1);
   if (!IS_INT (fileStream->file))
-    {
-      UNPOP (numArgs);
-      PRIM_FAILED;
-    }
+    goto fail;
 
   fd = TO_INT (fileStream->file);
   switch (arg1)
     {
 
     case PRIM_CLOSE_FILE:	/* FileDescriptor close */
-      SET_STACKTOP_INT (close (fd));
-      PRIM_SUCCEEDED;
+      resultOOP = FROM_INT (close (fd));
+      goto succeed;
 
     case PRIM_FSEEK_SET:		/* FileDescriptor position: position */
       if (IS_OFF_T (oopVec[1]) &&
@@ -5267,7 +5249,7 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 	  break;
 	}
       else
-	PRIM_SUCCEEDED;
+        goto succeed;
 
     case PRIM_FTELL:		/* FileDescriptor position */
       {
@@ -5278,19 +5260,24 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 	    break;
 	  }
 
-	SET_STACKTOP (FROM_OFF_T (off));
-	PRIM_SUCCEEDED;
+	resultOOP = FROM_OFF_T (off);
+	goto succeed;
       }
 
     case PRIM_FEOF:
       {				/* FileDescriptor atEnd */
 	off_t oldPos;
 	oldPos = lseek (fd, 0, SEEK_CUR);
-	SET_STACKTOP_BOOLEAN (oldPos >= 0
-			      && lseek (fd, 0, SEEK_END) == oldPos);
-	lseek (fd, oldPos, SEEK_SET);
+	if (oldPos >= 0 && lseek (fd, 0, SEEK_END) == oldPos)
+	  resultOOP = _gst_true_oop;
+	else
+	  {
+	    resultOOP = _gst_false_oop;
+	    if (oldPos >= 0)
+	      lseek (fd, oldPos, SEEK_SET);
+	  }
 	errno = 0;
-	PRIM_SUCCEEDED;
+	goto succeed;
       }
 
     case PRIM_FSIZE:
@@ -5301,8 +5288,8 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 	    errno = 0;
 	    break;
 	  }
-	SET_STACKTOP_INT (statBuf.st_size);
-	PRIM_SUCCEEDED;
+	resultOOP = FROM_INT (statBuf.st_size);
+	goto succeed;
       }
 
     case PRIM_PUT_CHARS:
@@ -5319,8 +5306,8 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 	      result = _gst_write (fd, data + from - 1, to - from + 1);
 	      if (result >= 0)
 		{
-		  SET_STACKTOP_INT (result);
-		  PRIM_SUCCEEDED;
+		  resultOOP = FROM_INT (result);
+		  goto succeed;
 		}
 	    }
 	}
@@ -5345,8 +5332,8 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 
 	      if (result >= 0)
 		{
-		  SET_STACKTOP_INT (result);
-		  PRIM_SUCCEEDED;
+		  resultOOP = FROM_INT (result);
+		  goto succeed;
 		}
 	    }
 	}
@@ -5385,8 +5372,8 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 
 	      if (result >= 0)
 		{
-		  SET_STACKTOP_INT (result);
-		  PRIM_SUCCEEDED;
+		  resultOOP = FROM_INT (result);
+		  goto succeed;
 		}
 	    }
 	}
@@ -5425,8 +5412,8 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 
 	      if (result >= 0)
 		{
-		  SET_STACKTOP_INT (result);
-		  PRIM_SUCCEEDED;
+		  resultOOP = FROM_INT (result);
+		  goto succeed;
 		}
 	    }
 	}
@@ -5440,7 +5427,7 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 	  break;
 
 	ftruncate (fd, pos);
-	PRIM_SUCCEEDED;
+	goto succeed;
       }
 
     case PRIM_FSEEK_CUR:		/* FileDescriptor skip: */
@@ -5448,7 +5435,7 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 	  lseek (fd, TO_OFF_T (oopVec[1]), SEEK_CUR) < 0)
 	break;
       else
-	PRIM_SUCCEEDED;
+	goto succeed;
 
     case PRIM_SYNC_POLL:
       {
@@ -5457,8 +5444,8 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 	result = _gst_sync_file_polling (fd, TO_INT (oopVec[1]));
 	if (result >= 0)
 	  {
-	    SET_STACKTOP_INT (result);
-	    PRIM_SUCCEEDED;
+	    resultOOP = FROM_INT (result);
+	    goto succeed;
 	  }
       }
       break;
@@ -5470,7 +5457,7 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 	result =
 	  _gst_async_file_polling (fd, TO_INT (oopVec[1]), oopVec[2]);
 	if (result >= 0)
-	  PRIM_SUCCEEDED;
+	  goto succeed;
       }
       break;
 
@@ -5479,25 +5466,21 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 	off_t result;
 
 	result = lseek (fd, 0, SEEK_END);
-	if (result == -1)
+	if (result != -1)
 	  {
-	    if (errno == ESPIPE || errno == EINVAL)
-	      {
-		SET_STACKTOP (_gst_true_oop);
-		errno = 0;
-	      }
-	    else
-	      PRIM_FAILED;
+	    lseek (fd, result, SEEK_SET);
+	    resultOOP = _gst_false_oop;
+	    goto succeed;
 	  }
-	else
+	else if (errno == ESPIPE || errno == EINVAL)
 	  {
-	    lseek (fd, result, SEEK_SET);
-	    SET_STACKTOP (_gst_false_oop);
+	    resultOOP = _gst_true_oop;
+	    errno = 0;
+	    goto succeed;
 	  }
 
-	PRIM_SUCCEEDED;
+	goto fail;
       }
-      break;
 
     case PRIM_SHUTDOWN_WRITE:
       shutdown (fd, 1);
@@ -5509,14 +5492,19 @@ primitive VMpr_FileDescriptor_fileOp [succeed,fail]
 	  errno = 0;
 	}
 #endif
-      break;
+      goto succeed;
     }
 
+ fail:
   if (errno)
     _gst_set_errno (errno);
 
-  UNPOP (numArgs);
   PRIM_FAILED;
+
+ succeed:
+  POP_N_OOPS (numArgs);
+  SET_STACKTOP (resultOOP);
+  PRIM_SUCCEEDED;
 }
 
 /* FileDescriptor>>#socketOp..., socket version, variadic */
@@ -5525,7 +5513,7 @@ primitive VMpr_FileDescriptor_socketOp [succeed,fail]
 {
   gst_file_stream fileStream;
   int fd;
-  OOP oop1;
+  OOP oop1, resultOOP;
   OOP *oopVec = alloca (numArgs * sizeof (OOP));
   int i;
   intptr_t arg1;
@@ -5536,20 +5524,16 @@ primitive VMpr_FileDescriptor_socketOp [succeed,fail]
   for (i = numArgs; --i >= 0;)
     oopVec[i] = POP_OOP ();
 
-  oop1 = STACKTOP ();
+  resultOOP = oop1 = STACKTOP ();
+  UNPOP (numArgs);
   if (!IS_INT (oopVec[0]))
-    {
-      UNPOP (numArgs);
-      PRIM_FAILED;
-    }
+    goto fail;
 
   arg1 = TO_INT (oopVec[0]);
   fileStream = (gst_file_stream) OOP_TO_OBJ (oop1);
   if (IS_NIL (fileStream->file))
-    {
-      UNPOP (numArgs);
-      PRIM_FAILED;
-    }
+    goto fail;
+
   fd = TO_INT (fileStream->file);
   switch (arg1)
     {
@@ -5557,8 +5541,8 @@ primitive VMpr_FileDescriptor_socketOp [succeed,fail]
     case PRIM_CLOSE_FILE:	/* FileDescriptor close */
       {
         int result = closesocket (fd);
-        SET_STACKTOP_INT (result);
-        PRIM_SUCCEEDED;
+        resultOOP = FROM_INT (result);
+        goto succeed;
       }
 
     case PRIM_PUT_CHARS:
@@ -5578,8 +5562,8 @@ primitive VMpr_FileDescriptor_socketOp [succeed,fail]
 		abort ();
 	      if (result >= 0)
 		{
-		  SET_STACKTOP_INT (result);
-		  PRIM_SUCCEEDED;
+		  resultOOP = FROM_INT (result);
+		  goto succeed;
 		}
 	    }
 	}
@@ -5612,8 +5596,8 @@ primitive VMpr_FileDescriptor_socketOp [succeed,fail]
 
 	      if (result >= 0)
 		{
-		  SET_STACKTOP_INT (result);
-		  PRIM_SUCCEEDED;
+		  resultOOP = FROM_INT (result);
+		  goto succeed;
 		}
 	    }
 	}
@@ -5626,8 +5610,8 @@ primitive VMpr_FileDescriptor_socketOp [succeed,fail]
 	result = _gst_sync_file_polling (fd, TO_INT (oopVec[1]));
 	if (result >= 0)
 	  {
-	    SET_STACKTOP_INT (result);
-	    PRIM_SUCCEEDED;
+	    resultOOP = FROM_INT (result);
+	    goto succeed;
 	  }
       }
       break;
@@ -5639,22 +5623,25 @@ primitive VMpr_FileDescriptor_socketOp [succeed,fail]
 	result =
 	  _gst_async_file_polling (fd, TO_INT (oopVec[1]), oopVec[2]);
 	if (result >= 0)
-	  PRIM_SUCCEEDED;
+	  goto succeed;
       }
       break;
 
     case PRIM_IS_PIPE:
-      {
-	SET_STACKTOP (_gst_true_oop);
-	PRIM_SUCCEEDED;
-      }
+      resultOOP =_gst_true_oop;
+      goto succeed;
       break;
     }
 
-  UNPOP (numArgs);
 #endif
 
+ fail:
   PRIM_FAILED;
+
+ succeed:
+  POP_N_OOPS (numArgs);
+  SET_STACKTOP (resultOOP);
+  PRIM_SUCCEEDED;
 }
 
 /* C callout primitives.  */

Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnu-smalltalk.spec	4 Jan 2008 02:33:49 -0000	1.29
+++ gnu-smalltalk.spec	15 Jan 2008 18:00:19 -0000	1.30
@@ -1,17 +1,16 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
-Version: 2.3.6
-Release: 8%{?dist}
+Version: 3.0
+Release: 1%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
-Patch1: gst-2.3.6-am.patch
-Patch2: gst-2.3.6-pathfix.patch
-Patch3: gst-2.3.6-multilib.patch
+Patch1: gst-3.0-am.patch
+Patch2: gst-3.0-tst117.patch
 License: GPLv2
 Group: Development/Languages
 URL: http://www.gnu.org/software/smalltalk/smalltalk.html
 Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
-ExcludeArch: ppc64
+ExcludeArch: ppc64 ppc
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -64,14 +63,11 @@
 
 %prep
 %setup -q -n smalltalk-%{version}
-%patch1 -p1
-%patch2 -p1 
-%patch3 -p1 -b .org
+%patch1 -p1 -b .auto
+%patch2 -p1 -b .tst117
 
 %build
-# automake
-# autoreconf
-
+autoreconf
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} \
   --enable-static=no --enable-shared=yes --disable-rpath \
   --with-imagedir=%{_libdir}/%{name}
@@ -101,6 +97,11 @@
 
 rm -rf $RPM_BUILD_ROOT/%{_infodir}/dir
 
+cd $RPM_BUILD_ROOT/%{_mandir}/man1
+
+rm gst-reload.1
+ln -sf ./gst-load.1 gst-reload.1
+
 %check
 make check
 
@@ -125,6 +126,9 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/gst
+%{_bindir}/gst-blox
+%{_bindir}/gst-convert
+%{_bindir}/gst-doc
 %{_bindir}/gst-load
 %{_bindir}/gst-package
 %{_bindir}/gst-reload
@@ -135,7 +139,11 @@
 %{_infodir}/gst.info*
 %{_infodir}/gst-*.info*
 
+%{_datadir}/gnu-smalltalk/
+%{_libexecdir}/gnu-smalltalk/
+
 %{_mandir}/man1/gst.1*
+%{_mandir}/man1/gst-*
 
 %doc AUTHORS COPYING COPYING.DOC COPYING.LIB ChangeLog 
 %doc NEWS README THANKS TODO
@@ -158,6 +166,9 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
+* Tue Jan 15 2008 Jochen Schmitt <Jochen herr-schmitt de> 3.0-1
+- New upstream release
+
 * Thu Jan 03 2008 Alex Lancaster <alexlan fedoraproject.org> 2.3.6-8
 - Rebuild for Tcl 8.5
 


--- gst-2.3.6-am.patch DELETED ---




More information about the fedora-extras-commits mailing list