From 9a8544dfdc915dc310f926e509b6a425b847f244 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 14:41:50 +0000 Subject: [PATCH 1/6] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From ad0182474c70a43e2f8a85af0716d09ffb40b708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Milmeister?= Date: Wed, 11 Jun 2008 16:00:42 +0000 Subject: [PATCH 2/6] new release 2.45 --- .cvsignore | 2 +- clisp.spec | 40 +++++++++++++++++++--------------------- sources | 2 +- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/.cvsignore b/.cvsignore index 89dfdcb..af640dd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clisp-2.43.tar.bz2 +clisp-2.45.tar.bz2 diff --git a/clisp.spec b/clisp.spec index 44de451..331f225 100644 --- a/clisp.spec +++ b/clisp.spec @@ -1,21 +1,21 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation -Version: 2.43 -Release: 5%{?dist} +Version: 2.45 +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: diffutils +BuildRequires: ffcall BuildRequires: gdbm-devel BuildRequires: gettext BuildRequires: gtk2-devel -BuildRequires: libglade2-devel BuildRequires: libICE-devel BuildRequires: libSM-devel BuildRequires: libX11-devel @@ -25,11 +25,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 @@ -69,16 +71,15 @@ Files necessary for linking CLISP. # 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|-O2|-O0|" src/makemake.in %build -# no berkeley db until fixed for new version -# --with-module=berkeley-db ./configure --prefix=%{_prefix} \ --libdir=%{_libdir} \ + --mandir=%{_mandir} \ + --docdir=%{_docdir}/clisp-%{version} \ --fsstnd=redhat \ - --with-dynamic-ffi \ --with-module=bindings/glibc \ --with-module=clx/new-clx \ --with-module=gdbm \ @@ -88,20 +89,14 @@ sed -i "s|-O2|-O0|" src/makemake.in --with-module=rawsock \ --with-module=wildcard \ --with-module=zlib \ + --with-module=berkeley-db \ --with-readline \ - --build build # CFLAGS="$RPM_OPT_FLAGS" - + build # CFLAGS="$RPM_OPT_FLAGS" +make -C build %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 %find_lang %{name} @@ -147,6 +142,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* 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..6fa89a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -45cf7ab628cab83e99ceaa75aa880b63 clisp-2.43.tar.bz2 +1f26ef23ca310366e328df925c23c663 clisp-2.45.tar.bz2 From 856d925a0cc194c9a19fc10a5d892bece44261b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Milmeister?= Date: Wed, 2 Jul 2008 18:42:55 +0000 Subject: [PATCH 3/6] *** empty log message *** --- .cvsignore | 2 +- clisp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index af640dd..d17cdc8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clisp-2.45.tar.bz2 +clisp-2.46.tar.bz2 diff --git a/clisp.spec b/clisp.spec index 331f225..3e1ad5c 100644 --- a/clisp.spec +++ b/clisp.spec @@ -1,6 +1,6 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation -Version: 2.45 +Version: 2.46 Release: 1%{?dist} Group: Development/Languages @@ -142,6 +142,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* 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 diff --git a/sources b/sources index 6fa89a8..c93978e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f26ef23ca310366e328df925c23c663 clisp-2.45.tar.bz2 +8c4d8ed0f40e01999c4d799328a86c39 clisp-2.46.tar.bz2 From 916f3a81cfb8e68afe58f6cc22786152afb1efd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Milmeister?= Date: Sun, 23 Nov 2008 00:42:37 +0000 Subject: [PATCH 4/6] new release 2.47 --- .cvsignore | 2 +- clisp.spec | 44 +++++++++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index d17cdc8..46d25c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clisp-2.46.tar.bz2 +clisp-2.47.tar.bz2 diff --git a/clisp.spec b/clisp.spec index 3e1ad5c..21d09cd 100644 --- a/clisp.spec +++ b/clisp.spec @@ -1,6 +1,6 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation -Version: 2.46 +Version: 2.47 Release: 1%{?dist} Group: Development/Languages @@ -11,7 +11,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: imake BuildRequires: libsigsegv-devel BuildRequires: readline-devel +BuildRequires: dbus-devel BuildRequires: diffutils +BuildRequires: fcgi-devel BuildRequires: ffcall BuildRequires: gdbm-devel BuildRequires: gettext @@ -68,37 +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 +%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} \ + --mandir=%{_mandir} \ + --docdir=%{_docdir}/clisp-%{version} \ --fsstnd=redhat \ + --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-module=berkeley-db \ - --with-readline \ - build # CFLAGS="$RPM_OPT_FLAGS" -make -C build + --with-readline \ + --cbc \ + build CFLAGS=%opt_flags %install rm -rf $RPM_BUILD_ROOT 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 @@ -127,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 @@ -142,6 +157,9 @@ 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 diff --git a/sources b/sources index c93978e..6e50c17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c4d8ed0f40e01999c4d799328a86c39 clisp-2.46.tar.bz2 +8fa89bb13e865fc7c7150b82682f35af clisp-2.47.tar.bz2 From 06b7924ff2b3384f2852ba6c68acfb6bebcd2e09 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 31c756fc3b20dab5bbd38ac40e96229775eb4cc1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:49:17 +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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9