rpms/gnu-smalltalk/FC-6 gst-2.3.3-am.patch, NONE, 1.1 gnu-smalltalk.spec, 1.5, 1.6 sources, 1.3, 1.4 gst-2.3.2-am.patch, 1.2, NONE

[Jochen Schmitt (s4504kr)]

Author: s4504kr

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

Modified Files:
	gnu-smalltalk.spec sources 
Added Files:
	gst-2.3.3-am.patch 
Removed Files:
	gst-2.3.2-am.patch 
Log Message:
New upstream release

gst-2.3.3-am.patch:

--- NEW FILE gst-2.3.3-am.patch ---
--- smalltalk-2.3.3/configure.automake	2007-02-13 09:25:30.000000000 +0100
+++ smalltalk-2.3.3/configure	2007-02-14 22:12:54.000000000 +0100
@@ -723,7 +723,7 @@
 
 # Identity of this package.
 PACKAGE_NAME='GNU Smalltalk'
-PACKAGE_TARNAME='smalltalk'
+PACKAGE_TARNAME='gnu-smalltalk'
 PACKAGE_VERSION='2.3.3'
 PACKAGE_STRING='GNU Smalltalk 2.3.3'
 PACKAGE_BUGREPORT='help-smalltalk at gnu.org'
@@ -1497,7 +1497,7 @@
   --infodir=DIR          info documentation [DATAROOTDIR/info]
   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/smalltalk]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/gnu-smalltalk]
   --htmldir=DIR          html documentation [DOCDIR]
   --dvidir=DIR           dvi documentation [DOCDIR]
   --pdfdir=DIR           pdf documentation [DOCDIR]
@@ -2427,7 +2427,7 @@
 
 
 # Define the identity of the package.
- PACKAGE='smalltalk'
+ PACKAGE='gnu-smalltalk'
  VERSION='2.3.3'
 
 
--- smalltalk-2.3.3/Makefile.in.automake	2007-02-13 16:13:32.000000000 +0100
+++ smalltalk-2.3.3/Makefile.in	2007-02-14 22:17:49.000000000 +0100
@@ -274,7 +274,7 @@
 NCURSES_DISABLED = @NCURSES_DISABLED@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-PACKAGE = smalltalk
+PACKAGE = gnu-smalltalk
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
@@ -322,7 +322,7 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-imagedir = @imagedir@
+imagedir = ${libdir}/@PACKAGE@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -1133,20 +1133,20 @@
 install-data-hook: gst-package
 	rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
 	./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" \
-	  --target-dir="$(pkgdatadir)" packages.xml
+	  --target-dir="$(imagedir)" packages.xml
 	$(mkdir_p) $(DESTDIR)$(imagedir)
 	rm -f $(DESTDIR)$(imagedir)/gst.im
 	srcdir=`cd $(srcdir) && pwd`; \
 	cd $(DESTDIR)$(imagedir) && \
-	SMALLTALK_KERNEL=$(DESTDIR)$(pkgdatadir)/kernel \
+	SMALLTALK_KERNEL=$(DESTDIR)$(imagedir)/kernel \
 	SMALLTALK_IMAGE=$(DESTDIR)$(imagedir) \
 	  $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \
-	    "$(pkgdatadir)" "$(imagedir)" $(MODULES)
+	    "$(imagedir)" "$(imagedir)" $(MODULES)
 
 uninstall-local:: gst-package
 	./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml
-	-rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
-	-rm -f $(DESTDIR)$(pkgdatadir)/gst.im
+	-rm -f $(DESTDIR)$(imagedir)/packages.xml
+	-rm -f $(DESTDIR)$(imagedir)/gst.im
 
 installcheck-local:
 	if test -n "$(DESTDIR)"; then :; else \
--- smalltalk-2.3.3/Makefile.am.automake	2007-02-13 16:13:22.000000000 +0100
+++ smalltalk-2.3.3/Makefile.am	2007-02-14 22:12:25.000000000 +0100
@@ -19,7 +19,7 @@
 AUTOMAKE_OPTIONS = gnu 1.8
 ACLOCAL_AMFLAGS = -I build-aux
 
-PACKAGE=smalltalk
+PACKAGE=gnu-smalltalk
 
 DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \
 	i18n tcp examples blox-tk . gtk tests doc
@@ -50,6 +50,7 @@
 ###########################################################
 
 pkgconfigdir = $(libdir)/pkgconfig
+imagedir = ${libdir}/@PACKAGE@
 nodist_pkgconfig_DATA = gnu-smalltalk.pc
 
 pkglib_DATA = libc.la
@@ -175,20 +176,20 @@
 install-data-hook: gst-package
 	rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
 	./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" \
-	  --target-dir="$(pkgdatadir)" packages.xml
+	  --target-dir="$(imagedir)" packages.xml
 	$(mkdir_p) $(DESTDIR)$(imagedir)
 	rm -f $(DESTDIR)$(imagedir)/gst.im
 	srcdir=`cd $(srcdir) && pwd`; \
 	cd $(DESTDIR)$(imagedir) && \
-	SMALLTALK_KERNEL=$(DESTDIR)$(pkgdatadir)/kernel \
+	SMALLTALK_KERNEL=$(DESTDIR)$(imagedir)/kernel \
 	SMALLTALK_IMAGE=$(DESTDIR)$(imagedir) \
 	  $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \
-	    "$(pkgdatadir)" "$(imagedir)" $(MODULES)
+	    "$(imagedir)" "$(imagedir)" $(MODULES)
 
 uninstall-local:: gst-package
 	./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml
-	-rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
-	-rm -f $(DESTDIR)$(pkgdatadir)/gst.im
+	-rm -f $(DESTDIR)$(imagedir)/packages.xml
+	-rm -f $(DESTDIR)$(imagedir)/gst.im
 
 installcheck-local:
 	if test -n "$(DESTDIR)"; then :; else \
--- smalltalk-2.3.3/configure.ac.automake	2007-02-13 09:25:00.000000000 +0100
+++ smalltalk-2.3.3/configure.ac	2007-02-14 22:12:25.000000000 +0100
@@ -7,7 +7,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.60)
-AC_INIT([GNU Smalltalk], 2.3.3, help-smalltalk at gnu.org, smalltalk)
+AC_INIT([GNU Smalltalk], 2.3.3, help-smalltalk at gnu.org, gnu-smalltalk)
 MAINTAINER="bonzini at gnu.org"
 
 dnl CURRENT:REVISION:AGE means this is the REVISION-th version of
--- smalltalk-2.3.3/examples/Makefile.in.automake	2007-02-14 22:17:01.000000000 +0100
+++ smalltalk-2.3.3/examples/Makefile.in	2007-02-14 22:17:48.000000000 +0100
@@ -277,7 +277,7 @@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-examplemodulesdir = $(pkgdatadir)/examples/modules
+examplemodulesdir = $(imagedir)/examples/modules
 dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st
 EXTRA_LTLIBRARIES = gdbm.la
 pkglib_LTLIBRARIES = @MODULES_EXAMPLE@ md5.la
--- smalltalk-2.3.3/examples/Makefile.am.automake	2007-02-14 22:16:46.000000000 +0100
+++ smalltalk-2.3.3/examples/Makefile.am	2007-02-14 22:17:43.000000000 +0100
@@ -1,4 +1,4 @@
-examplemodulesdir = $(pkgdatadir)/examples/modules
+examplemodulesdir = $(imagedir)/examples/modules
 
 dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st
 
--- smalltalk-2.3.3/libgst/Makefile.am.automake	2007-02-13 17:32:35.000000000 +0100
+++ smalltalk-2.3.3/libgst/Makefile.am	2007-02-14 22:12:25.000000000 +0100
@@ -113,6 +113,7 @@
 	@echo timestamp > $(srcdir)/match.stamp
 
 
+
 # rules for invoking genprims
 # Try to economize in the rebuilds, by avoiding unnecessary
 # changes to the timestamp of prims.inl


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-6/gnu-smalltalk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnu-smalltalk.spec	14 Feb 2007 17:04:02 -0000	1.5
+++ gnu-smalltalk.spec	14 Feb 2007 21:41:11 -0000	1.6
@@ -1,10 +1,9 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
-Version: 2.3.2
-Release: 6%{?dist}.1
-# Source: smalltalk-2.2b.tar.gz
+Version: 2.3.3
+Release: 2%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
-Patch1: gst-2.3.2-am.patch
+Patch1: gst-2.3.3-am.patch
 License: GPL
 Group: Development/Languages
 URL: http://www.gnu.org/software/smalltalk/smalltalk.html
@@ -69,7 +68,8 @@
 #autoreconf
 
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} \
-  --enable-static=no --enable-shared=yes --disable-rpath
+  --enable-static=no --enable-shared=yes --disable-rpath \
+  --with-imagedir=%{_libdir}/%{name}
 
 make %{?_smp_mflags} LIBTOOL="%{_bindir}/libtool" 
 
@@ -133,7 +133,6 @@
 %{_libdir}/pkgconfig/gnu-smalltalk.pc
 
 %{_datadir}/aclocal/*.m4
-%{_datadir}/gnu-smalltalk/
 
 %{_includedir}/gst.h   
 %{_includedir}/gstpub.h 
@@ -143,7 +142,10 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
-* Tue Feb 13 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 2.3.2-6.1
+* Wed Feb 14 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 2.3.3-2
+- New upstream release
+
+* Tue Feb 13 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 2.3.2-6
 - Solve multilib issue (#228175)
 
 * Sun Feb 11 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 2.3.2-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Jan 2007 16:16:45 -0000	1.3
+++ sources	14 Feb 2007 21:41:11 -0000	1.4
@@ -1 +1 @@
-2a4237e1d9b6296b290f5b5fe8d8efd7  smalltalk-2.3.2.tar.gz
+79eaff2e19b82b5da08ac5a939317a49  smalltalk-2.3.3.tar.gz


--- gst-2.3.2-am.patch DELETED ---