[gnu-smalltalk/f14/master] New upstream release

Tue Dec 21 00:31:55 UTC 2010

commit fa57b1e835124ba910e65b778f64b19e786d9d7e
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Mon Dec 20 18:18:47 2010 +0100

    New upstream release

 .gitignore                               |    1 +
 gnu-smalltalk.spec                       |   31 +++++++++++++++++-------
 gst-3.2-ltdl.patch                       |   37 ------------------------------
 gst-3.2-tst.patch                        |   14 -----------
 gst-3.2.2-emacs.patch                    |   14 -----------
 gst-3.2.2-am.patch => gst-3.2.3-am.patch |    4 +-
 gst-3.2.3-ltdl.patch                     |   12 +++++++++
 gst-3.2.3-tst.patch                      |   14 +++++++++++
 sources                                  |    2 +-
 9 files changed, 52 insertions(+), 77 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index e2bdd2c..4146ed3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 smalltalk-3.2.tar.gz
 smalltalk-3.2.2.tar.gz
+/smalltalk-3.2.3.tar.gz
diff --git a/gnu-smalltalk.spec b/gnu-smalltalk.spec
index cc8a2e0..5e2c81a 100644
--- a/gnu-smalltalk.spec
+++ b/gnu-smalltalk.spec
@@ -1,16 +1,15 @@
 Summary:        GNU Smalltalk
 Name:           gnu-smalltalk
-Version:        3.2.2
+Version:        3.2.3
 Release:        1%{?dist}
 
 Source:         ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
 Source1:        gnu-smalltalk.desktop
 Source2:        gnu-smalltalk.svg
 
-Patch1:         gst-3.2.2-am.patch
-Patch2:         gst-3.2-tst.patch
-Patch3:         gst-3.2-ltdl.patch
-Patch4:         gst-3.2.2-emacs.patch
+Patch1:         gst-3.2.3-am.patch
+Patch2:         gst-3.2.3-tst.patch
+Patch3:         gst-3.2.3-ltdl.patch
 
 License:        GPLv2+ with exceptions
 Group:          Development/Languages
@@ -100,22 +99,23 @@ with functions written in C.
 %patch1 -p1 -b .auto
 %patch2 -p1 -b .tst
 %patch3 -p1 -b .ltdl
-%patch4 -p1 -b .emx
-
-rm -rf lib-src/lt*
 
 %build
+libtoolize
 autoreconf
+rm -rf lib-src/lt*
 CFLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack"
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} \
   --enable-static=no --enable-shared=yes --disable-rpath \
   --with-system-libsigsegv \
   --with-system-libffi=yes \
   --with-system-libltdl=yes \
+  --with-lispdir=%{_emacs_sitelispdir}/gnu-smalltalk \
+  --with-lispstartdir=%{_emacs_sitestartdir} \
   --with-imagedir=%{_libdir}/%{name}
 
 # _smp_mflags seems not to work
-make %{?_smp_mflags}
+make # %{?_smp_mflags}
 
 cd doc
 
@@ -132,6 +132,13 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -c -p" install
 
+mkdir -p  ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
+
+mv ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/gnu-smalltalk/site-start.d/* \
+   ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
+
+rmdir ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/gnu-smalltalk/site-start.d
+
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/libgst*a*
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/gnu-smalltalk/*.la
 
@@ -228,6 +235,12 @@ fi
 %{_emacs_sitestartdir}/*.el
 
 %changelog
+* Sat Dec 18 2010 Jochen Schmitt <JOchen herr-schmitt de> 3.2.3-1
+- New upstream release
+
+* Sun Nov 28 2010 Rex Dieter <rdieter at fedoraproject.org> 3.2.2-2 
+- rebuild (libsigsegv)
+
 * Sun Aug  1 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.2.2-1
 - New upstream release
 
diff --git a/gst-3.2.2-am.patch b/gst-3.2.3-am.patch
similarity index 75%
rename from gst-3.2.2-am.patch
rename to gst-3.2.3-am.patch
index 5552583..c8b9534 100644
--- a/gst-3.2.2-am.patch
+++ b/gst-3.2.3-am.patch
@@ -5,8 +5,8 @@ diff -up smalltalk-3.2/configure.ac.auto smalltalk-3.2/configure.ac
  
  dnl 2.63 needed by testsuite, actually
  AC_PREREQ(2.63)
--AC_INIT([GNU Smalltalk], 3.2.2, help-smalltalk at gnu.org, smalltalk,
-+AC_INIT([GNU Smalltalk], 3.2.2, help-smalltalk at gnu.org, gnu-smalltalk,
+-AC_INIT([GNU Smalltalk], 3.2.3, help-smalltalk at gnu.org, smalltalk,
++AC_INIT([GNU Smalltalk], 3.2.3, help-smalltalk at gnu.org, gnu-smalltalk,
          [http://smalltalk.gnu.org/])
  MAINTAINER="bonzini at gnu.org"
  
diff --git a/gst-3.2.3-ltdl.patch b/gst-3.2.3-ltdl.patch
new file mode 100644
index 0000000..a43a1c6
--- /dev/null
+++ b/gst-3.2.3-ltdl.patch
@@ -0,0 +1,12 @@
+diff -up smalltalk-3.2/lib-src/Makefile.am.ltdl smalltalk-3.2/lib-src/Makefile.am
+--- smalltalk-3.2/lib-src/Makefile.am.ltdl	2010-05-02 19:59:34.232735191 +0200
++++ smalltalk-3.2/lib-src/Makefile.am	2010-05-02 19:59:49.835724459 +0200
+@@ -11,7 +11,7 @@ library_la_SOURCES = \
+ noinst_HEADERS = \
+        obstack.h poll_.h getopt.h md5.h ansidecl.h strspell.h lock.h \
+        mathl.h trigl.h avltrees.h rbtrees.h trigl.c sincosl.c getaddrinfo.h \
+-       socketx.h ltdl_.h regex.h pointer-set.h
++       socketx.h regex.h pointer-set.h
+ 
+ DISTCLEANFILES = poll.h ltdl.h
+ 
diff --git a/gst-3.2.3-tst.patch b/gst-3.2.3-tst.patch
new file mode 100644
index 0000000..09badc0
--- /dev/null
+++ b/gst-3.2.3-tst.patch
@@ -0,0 +1,14 @@
+diff -up smalltalk-3.2.3/tests/testsuite.at.tst smalltalk-3.2.3/tests/testsuite.at
+--- smalltalk-3.2.3/tests/testsuite.at.tst	2010-10-20 13:52:47.000000000 +0200
++++ smalltalk-3.2.3/tests/testsuite.at	2010-12-18 18:37:18.905792073 +0100
+@@ -158,8 +158,8 @@ AT_PACKAGE_TEST([Magritte])
+ AT_OPTIONAL_PACKAGE_TEST([ROE])
+ AT_PACKAGE_TEST([SandstoneDb])
+ AT_OPTIONAL_PACKAGE_TEST([Seaside-Core])
+-AT_PACKAGE_TEST([Sport])
+-AT_PACKAGE_TEST([Swazoo])
++# AT_PACKAGE_TEST([Sport])
++# AT_PACKAGE_TEST([Swazoo])
+ AT_OPTIONAL_PACKAGE_TEST([XML-XMLParser])
+ AT_OPTIONAL_PACKAGE_TEST([XML-Expat])
+ AT_OPTIONAL_PACKAGE_TEST([ZLib])
diff --git a/sources b/sources
index 6236887..ce95382 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15cb5a34b70316b2985a344886a7abf0  smalltalk-3.2.2.tar.gz
+9d39754f9892ba6474cdd8d00a7b7ffe  smalltalk-3.2.3.tar.gz
