From 35fbf565ce10b2ae36671a435293263d96bfd6b3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:03:12 +0000 Subject: [PATCH 1/3] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 9b7e0e0dc479d9cbaf1b562f71256acc82abf9e5 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 26 Feb 2010 21:41:44 +0000 Subject: [PATCH 2/3] - new release 2.48 --- .cvsignore | 2 +- clisp-2.47-cpp.patch | 13 ------ clisp.spec | 105 ++++++++++++++++++++++--------------------- sources | 2 +- 4 files changed, 57 insertions(+), 65 deletions(-) delete mode 100644 clisp-2.47-cpp.patch diff --git a/.cvsignore b/.cvsignore index 46d25c5..0a37e09 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clisp-2.47.tar.bz2 +clisp-2.48.tar.bz2 diff --git a/clisp-2.47-cpp.patch b/clisp-2.47-cpp.patch deleted file mode 100644 index d0331f9..0000000 --- a/clisp-2.47-cpp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up clisp-2.47/modules/libsvm/svm.cpp clisp-2.47/modules/libsvm/svm -diff -up clisp-2.47/src/time.d.cpp clisp-2.47/src/time.d ---- clisp-2.47/src/time.d.cpp 2009-03-01 20:14:24.000000000 +0100 -+++ clisp-2.47/src/time.d 2009-03-01 20:14:46.000000000 +0100 -@@ -302,7 +302,7 @@ global object internal_time_to_I (const - #ifdef TIME_WIN32 - return L2_to_I(tp->dwHighDateTime,tp->dwLowDateTime); - #endif --#elif TIME_METHOD = 1 -+#elif TIME_METHOD == 1 - return UL_to_I(*tp); - #else - #error internal_time_to_I: invalid TIME_METHOD diff --git a/clisp.spec b/clisp.spec index 41c41ba..d4744ee 100644 --- a/clisp.spec +++ b/clisp.spec @@ -1,39 +1,38 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation -Version: 2.47 -Release: 4%{?dist} +Version: 2.48 +Release: 1%{?dist} Group: Development/Languages License: GPLv2 URL: http://clisp.cons.org -Source: http://download.sourceforge.net/clisp/clisp-%{version}.tar.bz2 -Patch0: clisp-2.47-cpp.patch +Source: http://downloads.sourceforge.net/project/clisp/clisp/%{version}/clisp-%{version}.tar.bz2 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 -BuildRequires: gtk2-devel -BuildRequires: libICE-devel -BuildRequires: libSM-devel -BuildRequires: libX11-devel -BuildRequires: libXaw-devel -BuildRequires: libXext-devel -BuildRequires: libXft-devel -BuildRequires: libXmu-devel -BuildRequires: libXrender-devel -BuildRequires: libXt-devel -BuildRequires: libglade2-devel -BuildRequires: pcre-devel -BuildRequires: postgresql-devel -BuildRequires: zlib-devel -#BuildRequires: db4-devel -#BuildRequires: pari-devel +BuildRequires: dbus-devel +BuildRequires: diffutils +BuildRequires: fcgi-devel +BuildRequires: ffcall +BuildRequires: gdbm-devel +BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: libICE-devel +BuildRequires: libSM-devel +BuildRequires: libX11-devel +BuildRequires: libXaw-devel +BuildRequires: libXext-devel +BuildRequires: libXft-devel +BuildRequires: libXmu-devel +BuildRequires: libXrender-devel +BuildRequires: libXt-devel +BuildRequires: libglade2-devel +BuildRequires: pcre-devel +BuildRequires: postgresql-devel +BuildRequires: zlib-devel +BuildRequires: db4-devel +BuildRequires: pari-devel ExcludeArch: ppc64 @@ -63,7 +62,7 @@ Maxima, ACL2 and many other Common Lisp packages. %package devel Summary: Development files for CLISP Group: Development/Languages -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release}, automake %description devel Files necessary for linking CLISP. @@ -71,7 +70,6 @@ Files necessary for linking CLISP. %prep %setup -q -%patch0 -p1 -b .cpp sed -i 's|http://www.lisp.org/HyperSpec/|http://www.lispworks.com/documentation/HyperSpec/|g' \ doc/* src/*.d src/*.lisp @@ -85,28 +83,31 @@ ulimit -s unlimited %endif ./configure --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --docdir=%{_docdir}/clisp-%{version} \ - --fsstnd=redhat \ - --hyperspec=http://www.lispworks.com/documentation/HyperSpec/ \ - --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 \ - --cbc \ - build CFLAGS=%opt_flags + --libdir=%{_libdir} \ + --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=pari \ + --with-module=pcre \ + --with-module=postgresql \ + --with-module=rawsock \ + --with-module=readline \ + --with-module=regexp \ + --with-module=syscalls \ + --with-module=wildcard \ + --with-module=zlib \ + --with-readline \ + --cbc \ + build CFLAGS=%opt_flags %install rm -rf $RPM_BUILD_ROOT @@ -151,6 +152,7 @@ cat %{name}low.lang >> %{name}.lang %{_libdir}/clisp-*/full/*.h %{_libdir}/clisp-*/full/makevars %{_libdir}/clisp-*/linkkit +%{_datadir}/aclocal/clisp.m4 %clean @@ -158,6 +160,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Fri Feb 26 2010 Jerry James - 2.48-1 +- new release 2.48 + * Fri Jul 24 2009 Fedora Release Engineering - 2.47-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 6e50c17..aa92a50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fa89bb13e865fc7c7150b82682f35af clisp-2.47.tar.bz2 +5e4c4f7cdcf7a1ef4196b9897c287158 clisp-2.48.tar.bz2 From 532276b21ead7701216470fcac54b3b0f3794e67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:49:10 +0000 Subject: [PATCH 3/3] 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13