diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 89dfdcb..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -clisp-2.43.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..46d25c5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +clisp-2.47.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 6519ece..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 $$/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/clisp.spec b/clisp.spec index 44de451..21d09cd 100644 --- a/clisp.spec +++ b/clisp.spec @@ -1,21 +1,23 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation -Version: 2.43 -Release: 5%{?dist} +Version: 2.47 +Release: 1%{?dist} Group: Development/Languages License: GPLv2 URL: http://clisp.cons.org -Source: http://download.sourceforge.net/clisp/clisp-2.43.tar.bz2 +Source: http://download.sourceforge.net/clisp/clisp-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: diffutils BuildRequires: imake BuildRequires: libsigsegv-devel BuildRequires: readline-devel +BuildRequires: dbus-devel +BuildRequires: diffutils +BuildRequires: fcgi-devel +BuildRequires: ffcall BuildRequires: gdbm-devel BuildRequires: gettext BuildRequires: gtk2-devel -BuildRequires: libglade2-devel BuildRequires: libICE-devel BuildRequires: libSM-devel BuildRequires: libX11-devel @@ -25,11 +27,13 @@ BuildRequires: libXft-devel BuildRequires: libXmu-devel BuildRequires: libXrender-devel BuildRequires: libXt-devel +BuildRequires: libglade2-devel BuildRequires: pcre-devel BuildRequires: postgresql-devel BuildRequires: zlib-devel -# no berkeley db until fixed for new version -#BuildRequires: db4-devel +BuildRequires: db4-devel +#BuildRequires: pari-devel + ExcludeArch: ppc64 @@ -66,44 +70,52 @@ Files necessary for linking CLISP. %prep %setup -q -# enforced stack size seems to be too small -sed -i "s|STACK_LIMIT=.*|STACK_LIMIT=unlimited|" configure -sed -i "s|-fexpensive-optimizations||" src/makemake.in -sed -i "s|-O2|-O0|" src/makemake.in +sed -i 's|http://www.lisp.org/HyperSpec/|http://www.lispworks.com/documentation/HyperSpec/|g' \ + doc/* src/*.d src/*.lisp %build -# no berkeley db until fixed for new version -# --with-module=berkeley-db +%ifarch ppc ppc64 +%define opt_flags "$RPM_OPT_FLAGS -DNO_GENERATIONAL_GC" +ulimit -s unlimited +%else +%define opt_flags "$RPM_OPT_FLAGS" +%endif + ./configure --prefix=%{_prefix} \ --libdir=%{_libdir} \ + --mandir=%{_mandir} \ + --docdir=%{_docdir}/clisp-%{version} \ --fsstnd=redhat \ - --with-dynamic-ffi \ + --hyperspec=http://www.lispworks.com/documentation/HyperSpec/ \ + --with-module=berkeley-db \ --with-module=bindings/glibc \ --with-module=clx/new-clx \ + --with-module=dbus \ + --with-module=fastcgi \ --with-module=gdbm \ --with-module=gtk2 \ + --with-module=i18n \ --with-module=pcre \ --with-module=postgresql \ --with-module=rawsock \ + --with-module=regexp \ + --with-module=syscalls \ --with-module=wildcard \ --with-module=zlib \ - --with-readline \ - --build build # CFLAGS="$RPM_OPT_FLAGS" - + --with-readline \ + --cbc \ + build CFLAGS=%opt_flags %install rm -rf $RPM_BUILD_ROOT -make -C \ - build \ - prefix=%{_prefix} \ - libdir=%{_libdir} \ - mandir=%{_mandir} \ - docdir=%{_docdir}/clisp-%{version} \ - DESTDIR=$RPM_BUILD_ROOT \ - install +make -C build DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc/clisp.{dvi,1,ps} cp -p doc/mop-spec.pdf $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc +cp -p doc/*.png $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc +cp -p doc/Why-CLISP* $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc +cp -p doc/regexp.html $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc +find $RPM_BUILD_ROOT%{_libdir} -name '*.dvi' | xargs rm -f %find_lang %{name} %find_lang %{name}low cat %{name}low.lang >> %{name}.lang @@ -132,12 +144,10 @@ cat %{name}low.lang >> %{name}.lang %{_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 @@ -147,6 +157,15 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Sat Nov 22 2008 Gerard Milmeister - 2.47-1 +- new release 2.47 + +* Wed Jul 2 2008 Gerard Milmeister - 2.46-1 +- new release 2.46 + +* Fri Apr 18 2008 Gerard Milmeister - 2.44.1-1 +- new release 2.44.1 + * Fri Feb 22 2008 Gerard Milmeister - 2.43-5 - Compile with -O0 to avoid GCC 4.3 miscompilation diff --git a/sources b/sources index 7891647..6e50c17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -45cf7ab628cab83e99ceaa75aa880b63 clisp-2.43.tar.bz2 +8fa89bb13e865fc7c7150b82682f35af clisp-2.47.tar.bz2