rpms/guile/F-8 guile-1.8.4-multilib.patch, NONE, 1.1 guile-1.8.4-testsuite.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 guile.spec, 1.54, 1.55 sources, 1.13, 1.14 guile-1.8.0-multilib.patch, 1.1, NONE guile-1.8.0-rpath.patch, 1.1, NONE guile-1.8.1-slib.patch, 1.1, NONE
Miroslav Lichvar (mlichvar)
fedora-extras-commits at redhat.com
Tue Apr 15 16:32:53 UTC 2008
Author: mlichvar
Update of /cvs/pkgs/rpms/guile/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7297
Modified Files:
.cvsignore guile.spec sources
Added Files:
guile-1.8.4-multilib.patch guile-1.8.4-testsuite.patch
Removed Files:
guile-1.8.0-multilib.patch guile-1.8.0-rpath.patch
guile-1.8.1-slib.patch
Log Message:
- update to 1.8.4
- add %%check
- support slib-3a5
- move slibcat and slib symlink out of site directory
- set umask in scriptlet (#242936)
guile-1.8.4-multilib.patch:
--- NEW FILE guile-1.8.4-multilib.patch ---
diff -up guile-1.8.4/libguile/Makefile.in.multilib guile-1.8.4/libguile/Makefile.in
--- guile-1.8.4/libguile/Makefile.in.multilib 2008-02-20 19:34:05.000000000 +0100
+++ guile-1.8.4/libguile/Makefile.in 2008-02-20 19:34:05.000000000 +0100
@@ -1630,6 +1630,11 @@ install-nodist_modincludeHEADERS: $(nodi
f=$(am__strip_dir) \
echo " $(nodist_modincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(modincludedir)/$$f'"; \
$(nodist_modincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(modincludedir)/$$f"; \
+ if [ "$$f" = "scmconfig.h" ]; then \
+ grep -q "SCM_SIZEOF_LONG 4" "$(DESTDIR)$(modincludedir)/$$f" && g=32 || g=64; \
+ mv "$(DESTDIR)$(modincludedir)/$$f" "$(DESTDIR)$(modincludedir)/scmconfig-$$g.h"; \
+ $(nodist_modincludeHEADERS_INSTALL) "$${d}scmconfig.h.mlib" "$(DESTDIR)$(modincludedir)/$$f"; \
+ fi; \
done
uninstall-nodist_modincludeHEADERS:
diff -up guile-1.8.4/libguile/guile-snarf.in.multilib guile-1.8.4/libguile/guile-snarf.in
--- guile-1.8.4/libguile/guile-snarf.in.multilib 2008-02-12 15:04:09.000000000 +0100
+++ guile-1.8.4/libguile/guile-snarf.in 2008-02-20 19:40:21.000000000 +0100
@@ -39,7 +39,6 @@
# #endif
#
# If the environment variable CPP is set, use its value instead of the
-# C pre-processor determined at Guile configure-time: "@CPP@".
# Code:
@@ -75,7 +74,7 @@ tempdir="$TMPDIR/guile-snarf.$$"
(umask 077 && mkdir $tempdir) || exit 1
temp="$tempdir/tmp"
-if [ x"$CPP" = x ] ; then cpp="@CPP@" ; else cpp="$CPP" ; fi
+if [ x"$CPP" = x ] ; then cpp="gcc -E" ; else cpp="$CPP" ; fi
trap "rm -rf $tempdir" 0 1 2 15
diff -up /dev/null guile-1.8.4/libguile/scmconfig.h.mlib
--- /dev/null 2007-12-22 10:41:34.485021827 +0100
+++ guile-1.8.4/libguile/scmconfig.h.mlib 2008-02-20 19:34:05.000000000 +0100
@@ -0,0 +1,6 @@
+#include <bits/wordsize.h>
+#if __WORDSIZE == 32
+#include "libguile/scmconfig-32.h"
+#else
+#include "libguile/scmconfig-64.h"
+#endif
guile-1.8.4-testsuite.patch:
--- NEW FILE guile-1.8.4-testsuite.patch ---
diff -up guile-1.8.4/test-suite/tests/popen.test.testsuite guile-1.8.4/test-suite/tests/popen.test
--- guile-1.8.4/test-suite/tests/popen.test.testsuite 2006-08-25 03:21:39.000000000 +0200
+++ guile-1.8.4/test-suite/tests/popen.test 2008-02-21 10:24:09.000000000 +0100
@@ -82,7 +82,7 @@
(port (with-error-to-port (cdr pair)
(lambda ()
(open-input-pipe
- "exec 1>/dev/null; echo closed 1>&2; exec 2>/dev/null; sleep 999")))))
+ "exec 1>/dev/null; echo closed 1>&2; exec 2>/dev/null; sleep 3")))))
(close-port (cdr pair)) ;; write side
(and (char? (read-char (car pair))) ;; wait for child to do its thing
(char-ready? port)
@@ -132,7 +132,7 @@
(port (with-error-to-port (cdr pair)
(lambda ()
(open-output-pipe
- "exec 0</dev/null; echo closed 1>&2; exec 2>/dev/null; sleep 999")))))
+ "exec 0</dev/null; echo closed 1>&2; exec 2>/dev/null; sleep 3")))))
(close-port (cdr pair)) ;; write side
(and (char? (read-char (car pair))) ;; wait for child to do its thing
(catch 'system-error
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guile/F-8/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 17 Jul 2007 12:33:50 -0000 1.13
+++ .cvsignore 15 Apr 2008 16:32:15 -0000 1.14
@@ -1 +1 @@
-guile-1.8.2.tar.gz
+guile-1.8.4.tar.gz
Index: guile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guile/F-8/guile.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- guile.spec 22 Aug 2007 09:30:56 -0000 1.54
+++ guile.spec 15 Apr 2008 16:32:15 -0000 1.55
@@ -1,13 +1,13 @@
Summary: A GNU implementation of Scheme for application extensibility
Name: guile
-Version: 1.8.2
-Release: 2%{?dist}
+%define mver 1.8
+Version: 1.8.4
+Release: 1%{?dist}
Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz
URL: http://www.gnu.org/software/guile/
-Patch1: guile-1.8.0-rpath.patch
-Patch2: guile-1.8.1-slib.patch
+Patch1: guile-1.8.4-multilib.patch
+Patch2: guile-1.8.4-testsuite.patch
Patch4: guile-1.8.1-deplibs.patch
-Patch5: guile-1.8.0-multilib.patch
License: GPLv2+ and LGPLv2+
Group: Development/Languages
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,15 +42,18 @@
%prep
%setup -q
-%patch1 -p1 -b .rpath
-%patch2 -p1 -b .slib
+%patch1 -p1 -b .multilib
+%patch2 -p1 -b .testsuite
%patch4 -p1 -b .deplibs
-%patch5 -p1 -b .multilib
%build
%configure --disable-static --disable-error-on-warning
+# Remove RPATH
+sed -i 's|" $sys_lib_dlsearch_path "|" $sys_lib_dlsearch_path %{_libdir} "|' \
+ {,guile-readline/}libtool
+
make %{?_smp_mflags}
%install
@@ -70,6 +73,12 @@
iconv -f iso8859-1 -t utf-8 < $i > $i.utf8 && mv -f ${i}{.utf8,}
done
+touch $RPM_BUILD_ROOT%{_datadir}/guile/%{mver}/slibcat
+ln -s ../../slib $RPM_BUILD_ROOT%{_datadir}/guile/%{mver}/slib
+
+%check
+make %{?_smp_mflags} check
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -93,17 +102,29 @@
:
%triggerin -- slib
-ln -sfT ../../slib %{_datadir}/guile/site/slib
-rm -f %{_datadir}/guile/site/slibcat
-SCHEME_LIBRARY_PATH=%{_datadir}/slib/ \
- %{_bindir}/guile -l %{_datadir}/slib/guile.init -c "\
- (define (implementation-vicinity) \"%{_datadir}/guile/site/\")
- (require 'new-catalog)" &> /dev/null
+# Remove files created in guile < 1.8.3-2
+rm -f %{_datadir}/guile/site/slib{,cat}
+
+ln -sfT ../../slib %{_datadir}/guile/%{mver}/slib
+rm -f %{_datadir}/guile/%{mver}/slibcat
+export SCHEME_LIBRARY_PATH=%{_datadir}/slib/
+umask 0022
+
+# Build SLIB catalog
+for pre in \
+ "(use-modules (ice-9 slib))" \
+ "(load \"%{_datadir}/slib/guile.init\")"
+do
+ %{_bindir}/guile -c "$pre
+ (set! implementation-vicinity (lambda () \"%{_datadir}/guile/%{mver}/\"))
+ (require 'new-catalog)" &> /dev/null && break
+ rm -f %{_datadir}/guile/%{mver}/slibcat
+done
:
%triggerun -- slib
-if [ "$1" = 0 -o "$2" = 0 ]; then
- rm -f %{_datadir}/guile/site/slib{,cat}
+if [ "$2" = 0 ]; then
+ rm -f %{_datadir}/guile/%{mver}/slib{,cat}
fi
%files
@@ -115,7 +136,17 @@
%{_libdir}/libguile*.so.*
%{_libdir}/libguilereadline-*.so
%{_libdir}/libguile-srfi-srfi-*.so
-%{_datadir}/guile
+%dir %{_datadir}/guile
+%dir %{_datadir}/guile/%{mver}
+%{_datadir}/guile/%{mver}/ice-9
+%{_datadir}/guile/%{mver}/lang
+%{_datadir}/guile/%{mver}/oop
+%{_datadir}/guile/%{mver}/scripts
+%{_datadir}/guile/%{mver}/srfi
+%{_datadir}/guile/%{mver}/guile-procedures.txt
+%ghost %{_datadir}/guile/%{mver}/slibcat
+%ghost %{_datadir}/guile/%{mver}/slib
+%dir %{_datadir}/guile/site
%{_infodir}/*
%files devel
@@ -129,6 +160,13 @@
%{_includedir}/libguile.h
%changelog
+* Tue Apr 15 2008 Miroslav Lichvar <mlichvar at redhat.com> - 5:1.8.4-1
+- update to 1.8.4
+- add %%check
+- support slib-3a5
+- move slibcat and slib symlink out of site directory
+- set umask in scriptlet (#242936)
+
* Wed Aug 22 2007 Miroslav Lichvar <mlichvar at redhat.com> - 5:1.8.2-2
- update license tag
- redirect guile output in triggerin script
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guile/F-8/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 17 Jul 2007 12:33:50 -0000 1.13
+++ sources 15 Apr 2008 16:32:15 -0000 1.14
@@ -1 +1 @@
-a4b64a992deae0532f8015bcc6c40784 guile-1.8.2.tar.gz
+aacc6a384af88a85574717a9221f5c6e guile-1.8.4.tar.gz
--- guile-1.8.0-multilib.patch DELETED ---
--- guile-1.8.0-rpath.patch DELETED ---
--- guile-1.8.1-slib.patch DELETED ---
More information about the scm-commits
mailing list