rpms/gnu-smalltalk/FC-5 gst-2.3.3-path.patch, NONE, 1.1 gnu-smalltalk.spec, 1.5, 1.6

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/gnu-smalltalk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8379

Modified Files:
	gnu-smalltalk.spec 
Added Files:
	gst-2.3.3-path.patch 
Log Message:
Fix wrong paths in gst.im

gst-2.3.3-path.patch:

--- NEW FILE gst-2.3.3-path.patch ---
--- orig/scripts/Finish.st
+++ mod/scripts/Finish.st
@@ -43,11 +43,12 @@ ok ifFalse: [ ObjectMemory quit: 1 ]!
 
 "Remove DESTDIR and references to the build directory, from the paths
  stored in the image"
-| newImagePath newKernelBasePath |
+| newImagePath oldKernelBasePath newKernelBasePath |
+oldKernelBasePath := File pathFor: KernelFilePath.
 newKernelBasePath := Smalltalk arguments at: 1.
 newImagePath := Smalltalk arguments at: 2.
-KernelFilePath = newKernelBasePath
-    ifFalse: [ FileSegment relocateFrom: KernelFilePath to: newKernelBasePath ].
+oldKernelBasePath = newKernelBasePath ifFalse: [
+    FileSegment relocateFrom: oldKernelBasePath to: newKernelBasePath ].
 
 ImageFileName := 'gst.im'.
 ImageFilePath := newImagePath.

Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-5/gnu-smalltalk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnu-smalltalk.spec	14 Feb 2007 21:43:06 -0000	1.5
+++ gnu-smalltalk.spec	13 Mar 2007 16:08:11 -0000	1.6
@@ -1,9 +1,10 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
 Version: 2.3.3
-Release: 2%{?dist}
+Release: 4%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
 Patch1: gst-2.3.3-am.patch
+Patch2: gst-2.3.3-path.patch
 License: GPL
 Group: Development/Languages
 URL: http://www.gnu.org/software/smalltalk/smalltalk.html
@@ -62,6 +63,7 @@
 %prep
 %setup -q -n smalltalk-%{version}
 %patch1 -p1 -b .automake
+%patch2 -p1
 
 %build
 #automake
@@ -142,7 +144,10 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
-* Wed Feb 14 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 2.3.3-2
+* Tue Mar 13 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.3-4
+- Fix wrong paths in gst.im
+
+* Wed Feb 14 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 2.3.3-3
 - New upstream release
 
 * Tue Feb 13 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 2.3.2-6