From 1aa4055765dc595ecf2536fa33d876cbcd03b623 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 16:09:03 +0000 Subject: [PATCH 1/6] Initialize branch F-8 for clisp --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From b40d7645b8e21e0255576865740f05c2b0defa48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Milmeister?= Date: Sat, 24 Nov 2007 15:04:13 +0000 Subject: [PATCH 2/6] new release 2.43 --- clisp-2.40-doc.patch | 41 -------------- clisp-config-stacksize.patch | 51 ------------------ clisp.spec | 102 ++++++++++++++++++++--------------- 3 files changed, 58 insertions(+), 136 deletions(-) delete mode 100644 clisp-2.40-doc.patch delete mode 100644 clisp-config-stacksize.patch diff --git a/clisp-2.40-doc.patch b/clisp-2.40-doc.patch deleted file mode 100644 index f59a4f7..0000000 --- a/clisp-2.40-doc.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- documentation.lisp 02 Oct 2006 06:01:24 -0400 1.26 -+++ documentation.lisp 03 Oct 2006 10:47:23 -0400 -@@ -4,7 +4,7 @@ - - (in-package "CLOS") - --(defun function-documentation (x) -+(defun function-documentation (x &aux name) - (cond ((typep-class x ) - (std-gf-documentation x)) - ((eq (type-of x) 'FUNCTION) ; interpreted function? -@@ -12,8 +12,7 @@ - #+FFI ((eq (type-of x) 'ffi::foreign-function) - (getf (sys::%record-ref x 5) :documentation)) - ((sys::closurep x) (sys::closure-documentation x)) -- ((let ((name (sys::subr-info x))) ; subr -- (and name (get :documentation name)))) -+ ((setq name (sys::subr-info x)) (get :documentation name)) ; subr - (t (get :documentation (sys::%record-ref x 0))))) - - ;;; documentation -@@ -81,7 +80,7 @@ - (:method ((x slot-definition) (doc-type (eql 't))) - (slot-definition-documentation x))) - --(defun set-function-documentation (x new-value) -+(defun set-function-documentation (x new-value &aux name) - (cond ((typep-class x ) - (setf (std-gf-documentation x) new-value)) - ((eq (type-of x) 'FUNCTION) ; interpreted function? -@@ -89,8 +88,8 @@ - #+FFI ((eq (type-of x) 'ffi::foreign-function) - (setf (getf (sys::%record-ref x 5) :documentation) new-value)) - ((sys::closurep x) (sys::closure-set-documentation x new-value)) -- ((let ((name (sys::subr-info x))) ; subr -- (and name (setf (get :documentation name) new-value)))) -+ ((setq name (sys::subr-info x)) ; subr -+ (setf (get :documentation name) new-value)) - (t ; fsubr - (setf (get :documentation (sys::%record-ref x 0)) new-value)))) - diff --git a/clisp-config-stacksize.patch b/clisp-config-stacksize.patch deleted file mode 100644 index 5d8aae1..0000000 --- a/clisp-config-stacksize.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- configure 2006/10/18 01:36:48 1.104 -+++ configure 2007/01/02 21:51:40 1.105 -@@ -718,6 +718,17 @@ - fi - fi - -+# CLISP needs a lot of stack space for bootstrapping, -+# and insufficient stack space manifests itself via arbitrary GC errors. -+# it was believed that 8192 is enough until power5 came along: -+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=166347 -+STACK_LIMIT=16384 -+stacksizelimit=`ulimit -s 2>/dev/null || :` # cygwin /bin/sh ulimit is broken -+# need 3 separate test calls because of "integer expression expected" errors -+# when $stacksizelimit is "" or "unlimited" (no short-circuiting!) -+test -z "$stacksizelimit" || { test "$stacksizelimit" != unlimited && test "$stacksizelimit" -lt ${STACK_LIMIT}; } -+STACK_TOO_SMALL=$? # 0=true => need to reset; 1=false => big enough -+ - if test -z "$do_build"; then - - echo -@@ -729,13 +740,12 @@ - echo " ./makemake $makemake_args > Makefile" - echo " make config.lisp" - echo " ${EDITOR:-vi} config.lisp" -- stacksizelimit=`ulimit -s 2>/dev/null || :` # cygwin /bin/sh ulimit is broken -- if test -z "$stacksizelimit" || { test "$stacksizelimit" != unlimited && test "$stacksizelimit" -lt 8192; }; then -+ if [ "${STACK_TOO_SMALL}" = 0 ]; then - cat </dev/null; set -e; -+ if [ "${STACK_TOO_SMALL}" = 0 ]; then -+ set +e; ulimit -s ${STACK_LIMIT} 2>/dev/null; set -e; -+ fi - make - make check - cd .. diff --git a/clisp.spec b/clisp.spec index c553613..75c6827 100644 --- a/clisp.spec +++ b/clisp.spec @@ -1,21 +1,21 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation -Version: 2.41 -Release: 6%{?dist} +Version: 2.43 +Release: 1%{?dist} Group: Development/Languages -License: GPL +License: GPLv2 URL: http://clisp.cons.org -Source: http://download.sourceforge.net/clisp/clisp-2.41.tar.bz2 +Source: http://download.sourceforge.net/clisp/clisp-2.43.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: readline-devel -BuildRequires: gettext -BuildRequires: pcre-devel -BuildRequires: postgresql-devel +BuildRequires: diffutils +BuildRequires: imake BuildRequires: libsigsegv-devel -# no berkeley db until fixed for new version -#BuildRequires: db4-devel -BuildRequires: zlib-devel +BuildRequires: readline-devel +BuildRequires: gdbm-devel +BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: libglade2-devel BuildRequires: libICE-devel BuildRequires: libSM-devel BuildRequires: libX11-devel @@ -25,7 +25,11 @@ BuildRequires: libXft-devel BuildRequires: libXmu-devel BuildRequires: libXrender-devel BuildRequires: libXt-devel -BuildRequires: imake +BuildRequires: pcre-devel +BuildRequires: postgresql-devel +BuildRequires: zlib-devel +# no berkeley db until fixed for new version +#BuildRequires: db4-devel ExcludeArch: ppc64 @@ -69,19 +73,22 @@ sed -i "s|ulimit -s 8192|ulimit -s unlimited|" configure %build # no berkeley db until fixed for new version # --with-module=berkeley-db -CFLAGS="" ./configure --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --fsstnd=redhat \ - --with-dynamic-ffi \ - --with-module=clx/new-clx \ - --with-module=pcre \ - --with-module=postgresql \ - --with-module=rawsock \ - --with-module=wildcard \ - --with-module=zlib \ - --with-module=bindings/glibc \ +./configure --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --fsstnd=redhat \ + --with-dynamic-ffi \ + --with-module=bindings/glibc \ + --with-module=clx/new-clx \ + --with-module=gdbm \ + --with-module=gtk2 \ + --with-module=pcre \ + --with-module=postgresql \ + --with-module=rawsock \ + --with-module=wildcard \ + --with-module=zlib \ --with-readline \ - --build build + --build build \ + CFLAGS="$RPM_OPT_FLAGS" %install @@ -106,31 +113,32 @@ cat %{name}low.lang >> %{name}.lang %{_bindir}/clisp %{_mandir}/man1/* %{_docdir}/clisp-%{version} -%dir %{_libdir}/clisp/base -%dir %{_libdir}/clisp/full -%dir %{_libdir}/clisp -%{_libdir}/clisp/base/lispinit.mem -%{_libdir}/clisp/base/lisp.run -%{_libdir}/clisp/full/lispinit.mem -%{_libdir}/clisp/full/lisp.run -%{_libdir}/clisp/data +%dir %{_libdir}/clisp-*/base +%dir %{_libdir}/clisp-*/full +%dir %{_libdir}/clisp-* +%{_libdir}/clisp-*/base/lispinit.mem +%{_libdir}/clisp-*/base/lisp.run +%{_libdir}/clisp-*/full/lispinit.mem +%{_libdir}/clisp-*/full/lisp.run +%{_libdir}/clisp-*/data %{_datadir}/emacs/site-lisp/* +%{_datadir}/vim/vimfiles/after/syntax/* %files devel %defattr(-,root,root,-) -%attr(0755,root,root) %{_libdir}/clisp/clisp-link -%{_libdir}/clisp/base/*.a -%{_libdir}/clisp/base/*.o -%{_libdir}/clisp/base/*.h -%{_libdir}/clisp/base/*.dvi -%{_libdir}/clisp/base/makevars -%{_libdir}/clisp/full/*.a -%{_libdir}/clisp/full/*.o -%{_libdir}/clisp/full/*.h -%{_libdir}/clisp/full/*.dvi -%{_libdir}/clisp/full/makevars -%{_libdir}/clisp/linkkit +%attr(0755,root,root) %{_libdir}/clisp-*/clisp-link +%{_libdir}/clisp-*/base/*.a +%{_libdir}/clisp-*/base/*.o +%{_libdir}/clisp-*/base/*.h +%{_libdir}/clisp-*/base/*.dvi +%{_libdir}/clisp-*/base/makevars +%{_libdir}/clisp-*/full/*.a +%{_libdir}/clisp-*/full/*.o +%{_libdir}/clisp-*/full/*.h +%{_libdir}/clisp-*/full/*.dvi +%{_libdir}/clisp-*/full/makevars +%{_libdir}/clisp-*/linkkit %clean @@ -138,6 +146,12 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Sat Nov 24 2007 Gerard Milmeister - 2.43-1 +- new release 2.43 + +* Tue Oct 16 2007 Gerard Milmeister - 2.42-1 +- new release 2.42 + * Fri May 4 2007 David Woodhouse - 2.41-6 - Revert to overriding stack limit in specfile From 84c43e059147b37d5037a1ba8fb93d500bc7ba6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Milmeister?= Date: Sat, 24 Nov 2007 15:08:51 +0000 Subject: [PATCH 3/6] *** empty log message *** --- .cvsignore | 2 +- clisp.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0f2e16f..89dfdcb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clisp-2.41.tar.bz2 +clisp-2.43.tar.bz2 diff --git a/clisp.spec b/clisp.spec index 75c6827..4f810b4 100644 --- a/clisp.spec +++ b/clisp.spec @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.43 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: GPLv2 diff --git a/sources b/sources index ade5d68..7891647 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a7a00e82ebeeb72a75a032f84c36c6c clisp-2.41.tar.bz2 +45cf7ab628cab83e99ceaa75aa880b63 clisp-2.43.tar.bz2 From 656d9abd2d41a96135b439f083927639c2435392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Milmeister?= Date: Sat, 24 Nov 2007 16:35:25 +0000 Subject: [PATCH 4/6] *** empty log message *** --- clisp.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clisp.spec b/clisp.spec index 4f810b4..e104c19 100644 --- a/clisp.spec +++ b/clisp.spec @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.43 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: GPLv2 @@ -67,7 +67,7 @@ Files necessary for linking CLISP. %prep %setup -q # enforced stack size seems to be too small -sed -i "s|ulimit -s 8192|ulimit -s unlimited|" configure +sed -i "s|STACK_LIMIT=.*|STACK_LIMIT=unlimited|" configure %build From b8c7b7392660c6627cd3630b530b0cbc68ae4a0f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:30:15 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6519ece..0ff7754 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := clisp SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 87a8fc6603ac109e8e0901958ef56c1ee4e70142 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:49:07 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0ff7754..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: clisp -# $Id$ -NAME := clisp -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8