- updated alpha patch

- updated files

diff --git a/clisp-alpha.patch b/clisp-alpha.patch
index 4b1490bef77cff5874a5870b0d9a8ce69751a7ac..7a3a7f6b2def7951e811e63c3a6b2c90b0b7ff1b 100644 (file)
--- a/clisp-alpha.patch
+++ b/clisp-alpha.patch
@@ -22,14 +22,14 @@
        mem.heaps[0].heap_limit = start + round_down(1*part,map_pagesize);
        mem.heaps[0].heap_hardlimit =
          mem.heaps[1].heap_limit = start + round_down(2*part,map_pagesize);
---- clisp-2.35/src/lispbibl.d.orig     2005-08-26 18:43:19.000000000 +0200
-+++ clisp-2.35/src/lispbibl.d  2005-10-10 13:09:09.000000000 +0200
-@@ -3087,7 +3087,7 @@
+--- clisp-2.49/src/lispbibl.d.orig     2012-12-13 18:49:18.149361417 +0100
++++ clisp-2.49/src/lispbibl.d  2012-12-13 18:56:22.232685912 +0100
+@@ -2979,7 +2979,7 @@
  #endif
  
  
--#if (oint_addr_shift == 0) && (addr_shift == 0) && defined(TYPECODES) && !defined(WIDE_SOFT) && !(defined(SUN3) && !defined(UNIX_SUNOS4) && !defined(WIDE_SOFT)) && !(defined(AMD64) && defined(UNIX_LINUX))
-+#if (oint_addr_shift == 0) && (addr_shift == 0) && defined(TYPECODES) && !defined(WIDE_SOFT) && !(defined(SUN3) && !defined(UNIX_SUNOS4) && !defined(WIDE_SOFT)) && !(defined(AMD64) && defined(UNIX_LINUX)) && !(defined(DECALPHA) && defined(UNIX_LINUX))
- # If the address bits are the lower ones and not WIDE_SOFT,
- # memory mapping may be possible.
+-#if (oint_addr_shift == 0) && (addr_shift == 0) && defined(TYPECODES) && !defined(WIDE_SOFT) && !(defined(AMD64) && defined(UNIX_LINUX))
++#if (oint_addr_shift == 0) && (addr_shift == 0) && defined(TYPECODES) && !defined(WIDE_SOFT) && !(defined(AMD64) && defined(UNIX_LINUX)) && !(defined(DECALPHA) && defined(UNIX_LINUX))
+ /* If the address bits are the lower ones and not WIDE_SOFT,
+  memory mapping may be possible. */
  

diff --git a/clisp.spec b/clisp.spec
index 2168c2ddce4d1652d2868f823d0db3059525b080..885eb088b79de1c20a8bf965f3bac5f459bb6bf9 100644 (file)
--- a/clisp.spec
+++ b/clisp.spec
@@ -79,7 +79,7 @@ software livre, distribuído sob os termos da GNU GPL.
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 
 # changing default -O to optflags causes memory fault on amd64
@@ -130,13 +130,14 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -j1 -C src install \
        DESTDIR=$RPM_BUILD_ROOT \
        libdir=%{_libdir} \
-       lispdocdir=%{_docdir}/%{name}-%{version} \
+       docdir=%{_docdir}/%{name}-%{version} \
        mandir=%{_mandir} \
        TOPDIR=clisp
 
-install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/modules
-install modules/*/*.dvi $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/modules
+# already packaged as man/html/pdf
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/doc/clisp*.{1,ps}
 
+# clisp and clisplow domains
 %find_lang %{name} --all-name
 
 %clean
@@ -145,6 +146,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/clisp
+%attr(755,root,root) %{_bindir}/clisp-link
 %doc %{_docdir}/%{name}-%{version} 
 %dir %{_libdir}/clisp
 %dir %{_libdir}/clisp/base
@@ -152,12 +154,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/clisp/base/lispinit.mem
 %attr(755,root,root) %{_libdir}/clisp/base/lisp.run
 %{_libdir}/clisp/base/makevars
-%{_libdir}/clisp/clisp-link
+%{_libdir}/clisp/bindings
+%{_libdir}/clisp/build-aux
+%{_libdir}/clisp/clx
 %{_libdir}/clisp/data
-%dir %{_libdir}/clisp/full
-%attr(755,root,root) %{_libdir}/clisp/full/lisp.run
-%{_libdir}/clisp/full/*.[aho]
-%{_libdir}/clisp/full/lispinit.mem
-%{_libdir}/clisp/full/makevars
+%dir %{_libdir}/clisp/dynmod
+%{_libdir}/clisp/dynmod/*.lisp
+%attr(755,root,root) %{_libdir}/clisp/dynmod/lib-*.so
 %{_libdir}/clisp/linkkit
-%{_mandir}/man[13]/*
+%{_libdir}/clisp/wildcard
+%{_aclocaldir}/clisp.m4
+%{_mandir}/man1/clisp.1*
+%{_mandir}/man1/clisp-link.1*
+
+# TODO:
+#%{_datadir}/emacs/site-lisp/clhs.el
+#%{_datadir}/emacs/site-lisp/clisp-coding.el
+#%{_datadir}/emacs/site-lisp/clisp-ffi.el
+#%{_datadir}/emacs/site-lisp/clisp-indent.el
+#%{_datadir}/emacs/site-lisp/clisp-indent.lisp
+#%{_datadir}/vim/vimfiles/after/syntax/lisp.vim