diff --git a/.cvsignore b/.cvsignore index a704031..03eba0f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ecl-0.9i.tgz +ecl-0.9j.tgz diff --git a/ecl-0.9i-gcc41.patch b/ecl-0.9i-gcc41.patch deleted file mode 100644 index cb0a153..0000000 --- a/ecl-0.9i-gcc41.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- ecl-0.9i/contrib/sockets/sockets.lisp.gcc41 2006-06-30 20:08:56.000000000 +0200 -+++ ecl-0.9i/contrib/sockets/sockets.lisp 2006-06-30 21:08:24.000000000 +0200 -@@ -437,7 +437,7 @@ - if (t == t_base_string) { - ok = (size < x->base_string.dim); - } else if (t == t_vector) { -- cl_elttype aet = x->vector.elttype; -+ cl_elttype aet = (cl_elttype)x->vector.elttype; - if (aet == aet_b8 || aet == aet_i8 || aet == aet_bc) { - ok = (size < x->vector.dim); - } else if (aet == aet_fix || aet == aet_index) { -@@ -567,7 +567,7 @@ - "{ - struct sockaddr_in sockaddr; - int addr_len = sizeof(struct sockaddr_in); -- int new_fd = accept(#0, (struct sockaddr*)&sockaddr, &addr_len); -+ int new_fd = accept(#0, (struct sockaddr*)&sockaddr, (socklen_t*)&addr_len); - - @(return 0) = new_fd; - @(return 1) = Cnil; -@@ -769,10 +769,10 @@ - sockaddr.sun_len = sizeof(struct sockaddr_un); - #endif - sockaddr.sun_family = #2; -- strncpy(&sockaddr.sun_path,#1,sizeof(sockaddr.sun_path)); -+ strncpy((char*)&sockaddr.sun_path,#1,sizeof(sockaddr.sun_path)); - sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0'; - -- @(return) = bind(#0,&sockaddr, sizeof(struct sockaddr_un)); -+ @(return) = bind(#0,(struct sockaddr*)&sockaddr, sizeof(struct sockaddr_un)); - }")) - (socket-error "bind")))) - -@@ -782,9 +782,9 @@ - "{ - struct sockaddr_un sockaddr; - int addr_len = sizeof(struct sockaddr_un); -- int new_fd = accept(#0, &sockaddr, &addr_len); -+ int new_fd = accept(#0, (struct sockaddr*)&sockaddr, (socklen_t*)&addr_len); - @(return 0) = new_fd; -- @(return 1) = (new_fd == -1) ? Cnil : make_base_string_copy(&sockaddr.sun_path); -+ @(return 1) = (new_fd == -1) ? Cnil : make_base_string_copy((char*)&sockaddr.sun_path); - }") - (cond - ((= fd -1) -@@ -812,10 +812,10 @@ - sockaddr.sun_len = sizeof(struct sockaddr_un); - #endif - sockaddr.sun_family = #1; -- strncpy(&sockaddr.sun_path,#2,sizeof(sockaddr.sun_path)); -+ strncpy((char*)&sockaddr.sun_path,#2,sizeof(sockaddr.sun_path)); - sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0'; - -- @(return) = connect(#0,&sockaddr, sizeof(struct sockaddr_un)); -+ @(return) = connect(#0,(struct sockaddr*)&sockaddr, sizeof(struct sockaddr_un)); - }")) - (socket-error "connect")))) - -@@ -826,10 +826,10 @@ - { - struct sockaddr_un name; - socklen_t len = sizeof(struct sockaddr_un); -- int ret = getpeername(#0,&name,&len); -+ int ret = getpeername(#0,(struct sockaddr*)&name,&len); - - if (ret == 0) { -- @(return) = make_base_string_copy(&name.sun_path); -+ @(return) = make_base_string_copy((char*)&name.sun_path); - } else { - @(return) = Cnil; - } -@@ -1104,7 +1104,7 @@ - buffering) - (t :int :int :object) - t -- "si_set_buffering_mode(ecl_make_stream_from_fd(#0,#1,#2), #3)" -+ "si_set_buffering_mode(ecl_make_stream_from_fd(#0,#1,(ecl_smmode)#2), #3)" - :one-liner t)) - - (defmethod socket-make-stream ((socket socket) &rest args &key (buffering-mode NIL)) diff --git a/ecl-gcc41.patch b/ecl-gcc41.patch deleted file mode 100644 index e0dcc49..0000000 --- a/ecl-gcc41.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ecl-0.9h/src/gc/include/gc_cpp.h.gcc41 2006-03-15 17:11:48.000000000 +0100 -+++ ecl-0.9h/src/gc/include/gc_cpp.h 2006-03-15 17:12:13.000000000 +0100 -@@ -180,7 +180,7 @@ - inline void* operator new[]( size_t size, void *p ); - inline void operator delete[]( void* obj ); - # ifdef GC_PLACEMENT_DELETE -- inline void gc::operator delete[]( void*, void* ); -+ inline void operator delete[]( void*, void* ); - # endif - #endif /* GC_OPERATOR_NEW_ARRAY */ - }; diff --git a/ecl.spec b/ecl.spec index 1d0e808..e1f3fc4 100644 --- a/ecl.spec +++ b/ecl.spec @@ -1,19 +1,21 @@ Name: ecl -Version: 0.9i -Release: 3%{?dist} +Version: 0.9j +Release: 1%{?dist} Summary: Embeddable Common-Lisp Group: Development/Languages -License: LGPL +License: LGPLv2+ URL: http://ecls.sourceforge.net -Source0: http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-0.9i.tgz -Patch1: ecl-0.9i-gcc41.patch +Source0: http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-0.9j.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel BuildRequires: m4 BuildRequires: texinfo -Requires(post): /sbin/install-info, policycoreutils -Requires(postun): /sbin/install-info, policycoreutils +BuildRequires: texi2html +BuildRequires: gmp-devel +Requires: gcc +Requires(post): policycoreutils +Requires(postun): policycoreutils %description ECL (Embeddable Common-Lisp) is an interpreter of the Common-Lisp @@ -27,15 +29,15 @@ to C, which can produce standalone executables. %prep %setup0 -q -%patch1 -p1 # wrong character in texinfo file perl -pi -e 's|\xc7||' src/doc/user.txi # set rpath to the final path perl -pi -e 's|-Wl,--rpath,~A|-Wl,--rpath,%{_libdir}/ecl|' src/configure +find -name CVS | xargs rm -rf %build -%configure --enable-boehm=included --enable-threads=yes --with-cxx +%configure --enable-boehm=included --enable-threads=yes --with-clx make -k (cd build/doc; make all html) @@ -43,25 +45,24 @@ make -k %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT%{_infodir}/dir +(cd build/doc; make DESTDIR=$RPM_BUILD_ROOT install) +rm -fr $RPM_BUILD_ROOT%{_infodir}/dir rm -fr $RPM_BUILD_ROOT%{_docdir} find $RPM_BUILD_ROOT%{_libdir}/ecl -name '*.lsp' | xargs chmod 0644 %post -/sbin/install-info %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || : -/sbin/install-info %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || : -/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/ecl/libecl.so" 2>/dev/null || : -/sbin/restorecon "%{_libdir}/ecl/libecl.so" 2> /dev/null || : +/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || : +/sbin/restorecon "%{_libdir}/libecl.so" 2> /dev/null || : +/sbin/ldconfig %postun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || : - /sbin/install-info --delete %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || : - /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/ecl/libecl.so" 2>/dev/null || : + /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/libecl.so" 2>/dev/null || : fi +/sbin/ldconfig %clean @@ -73,12 +74,19 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/ecl %{_bindir}/ecl-config %{_libdir}/ecl +%{_libdir}/libecl.so +%{_includedir}/ecl %{_mandir}/man*/* %{_infodir}/* -%doc ANNOUNCEMENT Copyright LGPL README.1st build/doc/*.html build/doc/ecl build/doc/ecldev +%doc ANNOUNCEMENT Copyright LGPL +%doc build/doc/*.html build/doc/ecl build/doc/ecldev +%doc examples %changelog +* Sat Dec 29 2007 Gerard Milmeister - 0.9j-1 +- new release 0.9j + * Mon Aug 28 2006 Gerard Milmeister - 0.9i-3 - Rebuild for FE6 diff --git a/sources b/sources index 79abdbf..f4210ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea47c0a9f47c510ff4654b44b004537a ecl-0.9i.tgz +9825dba9b0198e5e7822cf2bfae84a6d ecl-0.9j.tgz