diff --git a/guile-1.8.7.tar.bz2 b/guile-1.8.7.tar.bz2 deleted file mode 100644 index baf4225..0000000 --- a/guile-1.8.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd58d046243ae7de9d229db6576926d58e717309a7ab04fe0d8a344605e14bbd -size 3201465 diff --git a/guile-2.0.1.tar.bz2 b/guile-2.0.1.tar.bz2 new file mode 100644 index 0000000..5a50090 --- /dev/null +++ b/guile-2.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e79616f401fff2f55f081f04cb84e565b9fcf37d9834280543fe71ed767af459 +size 5364116 diff --git a/guile-popen-test.patch b/guile-popen-test.patch deleted file mode 100644 index 8226f13..0000000 --- a/guile-popen-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up guile-1.8.7/test-suite/tests/popen.test.testsuite guile-1.8.7/test-suite/tests/popen.test ---- guile-1.8.7/test-suite/tests/popen.test.testsuite 2009-07-04 00:19:00.000000000 +0200 -+++ guile-1.8.7/test-suite/tests/popen.test 2009-07-16 17:09:57.000000000 +0200 -@@ -168,7 +168,7 @@ - (port (with-error-to-port (cdr c2p) - (lambda () - (open-output-pipe -- "exec 0&2; done"))))) -+ "exec 0&2; sleep 3"))))) - (close-port (cdr c2p)) ;; write side - (with-epipe - (lambda () diff --git a/guile-testsuite-build.patch b/guile-testsuite-build.patch deleted file mode 100644 index 77559f9..0000000 --- a/guile-testsuite-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: guile-1.8.7/test-suite/standalone/Makefile.am -=================================================================== ---- guile-1.8.7.orig/test-suite/standalone/Makefile.am -+++ guile-1.8.7/test-suite/standalone/Makefile.am -@@ -28,7 +28,7 @@ check_SCRIPTS = - BUILT_SOURCES = - EXTRA_DIST = - --TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env" -+TESTS_ENVIRONMENT = builddir="$(builddir)" "${top_builddir}/pre-inst-guile-env" - - test_cflags = \ - -I$(top_srcdir)/test-suite/standalone \ -Index: guile-1.8.7/test-suite/standalone/test-asmobs -=================================================================== ---- guile-1.8.7.orig/test-suite/standalone/test-asmobs -+++ guile-1.8.7/test-suite/standalone/test-asmobs -@@ -2,7 +2,7 @@ - exec guile -q -s "$0" "$@" - !# - --(load-extension "libtest-asmobs" "libtest_asmobs_init") -+(load-extension (string-append (getenv "builddir") "/libtest-asmobs") "libtest_asmobs_init") - - (define (test x v) - (if v -@@ -114,4 +114,4 @@ exec guile -q -s "$0" "$@" - - ;; Local Variables: - ;; mode: scheme --;; End: -\ No newline at end of file -+;; End: diff --git a/guile.changes b/guile.changes index 73dc7c9..4066305 100644 --- a/guile.changes +++ b/guile.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Jul 14 12:13:33 UTC 2011 - pgajdos@novell.com + +- updated to 2.0.1: + ** REPL reader usability enhancements + ** REPL output has configurable width + ** Better C access to the module system + ** Added `scm_call_5', `scm_call_6' + ** Added `scm_from_latin1_keyword', `scm_from_utf8_keyword' + ** R6RS unicode and string I/O work + ** Added `pointer->scm', `scm->pointer' to `(system foreign)' + ** Added `heap-allocated-since-gc' to `(gc-stats)' + ** Add `on-error' REPL option + ** Enforce immutability of string literals + ** Fix pthread redirection + ** `with-continuation-barrier' now unwinds on `quit' + ** `string->pointer' and `pointer->string' have optional encoding arg + ** R6RS fixnum arithmetic optimizations + ** New procedure: `define-inlinable' + ** New procedure: `exact-integer-sqrt' + ** "Extended read syntax" for symbols parses better + ** Added `--fresh-auto-compile' option + ** etc., see ChangeLog and NEWS + +------------------------------------------------------------------- +Mon Mar 22 12:39:55 CET 2010 - pgajdos@suse.cz + +- fixed build with new gcc + ------------------------------------------------------------------- Tue Jan 26 19:26:58 CET 2010 - pgajdos@suse.cz diff --git a/guile.spec b/guile.spec index 640d11b..1230d28 100644 --- a/guile.spec +++ b/guile.spec @@ -1,7 +1,7 @@ # -# spec file for package guile (Version 1.8.7) +# spec file for package guile (Version 1.8.6) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,19 +18,17 @@ Name: guile -BuildRequires: gc-devel gmp-devel readline-devel -License: LGPLv2.1+ +BuildRequires: gmp-devel readline-devel libunistring-devel gc-devel pkg-config libffi-devel +License: LGPL v2.1 or later Group: Development/Languages/Scheme AutoReqProv: on -Version: 1.8.7 +Version: 2.0.1 Release: 2 Summary: GNU's Ubiquitous Intelligent Language for Extension Url: http://www.gnu.org/software/guile/ Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-64bit.patch Patch2: %{name}-1.6.10-mktemp.patch -Patch3: %{name}-popen-test.patch -Patch4: %{name}-testsuite-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: fileutils sh-utils PreReq: %install_info_prereq @@ -58,10 +56,10 @@ Authors: Tom Tromey %package devel -License: LGPLv2.1+ +License: LGPL v2.1 or later Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension -Requires: %{name} = %{version} gmp-devel readline-devel ncurses-devel +Requires: %{name} = %{version} gmp-devel readline-devel ncurses-devel gc-devel libunistring-devel libffi-devel %description devel This is Guile, a portable, embeddable Scheme implementation written in @@ -88,23 +86,18 @@ Authors: %setup -q %patch1 %patch2 -%patch3 -p1 -%patch4 -p1 -# guile-1.8.1: The code is not so good for -Werror (unused results of write()). -sed -i s/-Werror// configure.in configure # force rebuild with non-broken makeinfo -rm -f doc/*/*.info +#rm -f doc/*/*.info %build -autoreconf -fi # FIXME: Following files are apparently compiled without RPM_OPT_FLAGS: # gen-scmconfig.c,c-tokenize.c %configure --disable-static --with-pic\ --with-threads -make %{?jobs:-j%jobs} +make %check -make check +LD_LIBRARY_PATH="." make check %install make install DESTDIR=$RPM_BUILD_ROOT @@ -119,14 +112,10 @@ rm -fr $RPM_BUILD_ROOT %post devel %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/goops.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/guile-tut.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/r5rs.info.gz %postun devel %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/goops.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/guile-tut.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/r5rs.info.gz %pre @@ -136,7 +125,7 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig %files %defattr(-,root,root) -%doc ABOUT-NLS AUTHORS COPYING* ChangeLog* GUILE-VERSION HACKING +%doc ABOUT-NLS AUTHORS COPYING* ChangeLog GUILE-VERSION HACKING %doc LICENSE NEWS README THANKS %{_bindir}/* %{_datadir}/guile @@ -145,15 +134,14 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig %{_libdir}/libguile*.so %{_libdir}/libguile*.la %{_mandir}/man1/guile.1.gz +%{_libdir}/guile %files devel %defattr(-,root,root) %{_includedir}/* -%{_datadir}/aclocal/* +%{_datadir}/aclocal/guile.m4 %doc %{_infodir}/%{name}.info.gz %doc %{_infodir}/%{name}.info-[0-9].gz -%doc %{_infodir}/goops.info.gz -%doc %{_infodir}/guile-tut.info.gz %doc %{_infodir}/r5rs.info.gz %{_libdir}/pkgconfig/*