rpms/gnu-smalltalk/devel gst-2.3.4-am.patch, NONE, 1.1 gst-2.3.4-gdbm.patch, NONE, 1.1 gst-2.3.4-geo.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gnu-smalltalk.spec, 1.14, 1.15 sources, 1.5, 1.6 gst-2.3.3-am.patch, 1.1, NONE gst-2.3.3-path.patch, 1.1, NONE gst-2.3.3-pub.patch, 1.1, NONE
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Wed May 30 17:12:41 UTC 2007
Author: s4504kr
Update of /cvs/extras/rpms/gnu-smalltalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4473
Modified Files:
.cvsignore gnu-smalltalk.spec sources
Added Files:
gst-2.3.4-am.patch gst-2.3.4-gdbm.patch gst-2.3.4-geo.patch
Removed Files:
gst-2.3.3-am.patch gst-2.3.3-path.patch gst-2.3.3-pub.patch
Log Message:
New upstream release
gst-2.3.4-am.patch:
--- NEW FILE gst-2.3.4-am.patch ---
--- smalltalk-2.3.4/configure.automake 2007-05-28 12:40:14.000000000 +0200
+++ smalltalk-2.3.4/configure 2007-05-28 19:01:25.000000000 +0200
@@ -723,7 +723,7 @@
# Identity of this package.
PACKAGE_NAME='GNU Smalltalk'
-PACKAGE_TARNAME='smalltalk'
+PACKAGE_TARNAME='gnu-smalltalk'
PACKAGE_VERSION='2.3.4'
PACKAGE_STRING='GNU Smalltalk 2.3.4'
PACKAGE_BUGREPORT='help-smalltalk at gnu.org'
@@ -1498,7 +1498,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]
@@ -2431,7 +2431,7 @@
# Define the identity of the package.
- PACKAGE='smalltalk'
+ PACKAGE='gnu-smalltalk'
VERSION='2.3.4'
--- smalltalk-2.3.4/Makefile.in.automake 2007-05-28 12:40:11.000000000 +0200
+++ smalltalk-2.3.4/Makefile.in 2007-05-28 19:01:27.000000000 +0200
@@ -275,7 +275,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@
@@ -323,7 +323,7 @@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
-imagedir = @imagedir@
+imagedir = ${libdir}/@PACKAGE@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
@@ -1134,19 +1134,19 @@
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)
uninstall-local:: gst-package
./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml
- -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
+ -rm -f $(DESTDIR)$(imagesdir)/packages.xml
-rm -f $(DESTDIR)$(imagedir)/gst.im
installcheck-local:
--- smalltalk-2.3.4/Makefile.am.automake 2007-05-28 12:12:32.000000000 +0200
+++ smalltalk-2.3.4/Makefile.am 2007-05-28 18:59:31.000000000 +0200
@@ -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,19 +176,19 @@
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)
uninstall-local:: gst-package
./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml
- -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
+ -rm -f $(DESTDIR)$(imagesdir)/packages.xml
-rm -f $(DESTDIR)$(imagedir)/gst.im
installcheck-local:
--- smalltalk-2.3.4/configure.ac.automake 2007-05-28 12:39:36.000000000 +0200
+++ smalltalk-2.3.4/configure.ac 2007-05-28 19:00:42.000000000 +0200
@@ -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.4, help-smalltalk at gnu.org, smalltalk)
+AC_INIT([GNU Smalltalk], 2.3.4, 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.4/examples/Makefile.in.automake 2007-05-28 12:40:07.000000000 +0200
+++ smalltalk-2.3.4/examples/Makefile.in 2007-05-28 19:01:26.000000000 +0200
@@ -281,7 +281,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 zlib.st zlibtests.st
EXTRA_LTLIBRARIES = gdbm.la zlib.la
pkglib_LTLIBRARIES = @MODULES_EXAMPLE@ md5.la
--- smalltalk-2.3.4/examples/Makefile.am.automake 2007-05-24 22:10:25.000000000 +0200
+++ smalltalk-2.3.4/examples/Makefile.am 2007-05-28 18:51:51.000000000 +0200
@@ -1,4 +1,4 @@
-examplemodulesdir = $(pkgdatadir)/examples/modules
+examplemodulesdir = $(imagedir)/examples/modules
dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st zlib.st zlibtests.st
--- smalltalk-2.3.4/libgst/Makefile.am.automake 2007-02-13 17:32:35.000000000 +0100
+++ smalltalk-2.3.4/libgst/Makefile.am 2007-05-28 18:51:51.000000000 +0200
@@ -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
gst-2.3.4-gdbm.patch:
--- NEW FILE gst-2.3.4-gdbm.patch ---
--- smalltalk-2.3.4/examples/gdbm-c.st.orig 2007-05-24 22:11:07.000000000 +0200
+++ smalltalk-2.3.4/examples/gdbm-c.st 2007-05-29 21:08:24.000000000 +0200
@@ -40,7 +40,7 @@
CStruct subclass: #DatumStruct
declaration: #( "typedef struct { "
(#dPtr (#ptr #char))" char *dptr; "
- (#dSize #long) " int dsize; "
+ (#dSize #int) " int dsize; "
) " } datum; "
classVariableNames: ''
poolDictionaries: ''
gst-2.3.4-geo.patch:
--- NEW FILE gst-2.3.4-geo.patch ---
--- smalltalk-2.3.4/tests/geometry.st.torg 2006-02-05 19:41:42.000000000 +0100
+++ smalltalk-2.3.4/tests/geometry.st 2007-05-30 18:58:01.000000000 +0200
@@ -118,7 +118,7 @@
C := 160 at 240.
D := 50 at 50.
'A dist: B = ' print.
- (A dist: B) printNl.
+ ((A dist: B) - 136.0147050873 abs < 0.00001) printNl.
'C dotProduct: D = ' print.
(C dotProduct: D) printNl.
'C grid: D = ' print.
--- smalltalk-2.3.4/tests/geometry.ok.torg 2007-05-24 14:36:12.000000000 +0200
+++ smalltalk-2.3.4/tests/geometry.ok 2007-05-30 18:45:37.000000000 +0200
@@ -36,7 +36,7 @@
returned value is Point new "<0>"
Execution begins...
-'A dist: B = '136.0147050873544
+'A dist: B = 'true
'C dotProduct: D = '20000
'C grid: D = '150 at 250
'C normal = '-0.8320502943378438 at 0.5547001962252292
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 14 Feb 2007 21:35:09 -0000 1.5
+++ .cvsignore 30 May 2007 17:12:06 -0000 1.6
@@ -1 +1 @@
-smalltalk-2.3.3.tar.gz
+smalltalk-2.3.4.tar.gz
Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnu-smalltalk.spec 18 Mar 2007 19:11:23 -0000 1.14
+++ gnu-smalltalk.spec 30 May 2007 17:12:06 -0000 1.15
@@ -1,11 +1,11 @@
Summary: GNU Smalltalk
Name: gnu-smalltalk
-Version: 2.3.3
-Release: 5%{?dist}
+Version: 2.3.4
+Release: 1%{?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
-Patch3: gst-2.3.3-pub.patch
+Patch1: gst-2.3.4-am.patch
+Patch2: gst-2.3.4-geo.patch
+Patch3: gst-2.3.4-gdbm.patch
License: GPL
Group: Development/Languages
URL: http://www.gnu.org/software/smalltalk/smalltalk.html
@@ -24,6 +24,7 @@
BuildRequires: emacs
BuildRequires: libtool
BuildRequires: texinfo
+BuildRequires: zlib-devel
%description
GNU Smalltalk is an implementation that closely follows the
@@ -63,8 +64,8 @@
%prep
%setup -q -n smalltalk-%{version}
-%patch1 -p1 -b .automake
-%patch2 -p1
+%patch1 -p1
+%patch2 -p1
%patch3 -p1
%build
@@ -146,6 +147,9 @@
%{_datadir}/emacs/site-lisp/*
%changelog
+* Mon May 28 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.4-1
+- New upstream release
+
* Sun Mar 18 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.3-5
- Include Publish.st patch
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 14 Feb 2007 21:35:09 -0000 1.5
+++ sources 30 May 2007 17:12:06 -0000 1.6
@@ -1 +1 @@
-79eaff2e19b82b5da08ac5a939317a49 smalltalk-2.3.3.tar.gz
+bdbbd0a8486327bae54d2de29922c054 smalltalk-2.3.4.tar.gz
--- gst-2.3.3-am.patch DELETED ---
--- gst-2.3.3-path.patch DELETED ---
--- gst-2.3.3-pub.patch DELETED ---
More information about the fedora-extras-commits
mailing list