rpms/guile/devel guile.spec,1.55,1.56
Miroslav Lichvar (mlichvar)
fedora-extras-commits at redhat.com
Wed Jan 9 15:59:29 UTC 2008
- Previous message (by thread): rpms/urw-fonts/devel urw-fonts.spec,1.29,1.30
- Next message (by thread): rpms/slib/devel slib-3a5-guile.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 slib.spec, 1.14, 1.15 sources, 1.4, 1.5 slib-3a4-guile.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mlichvar
Update of /cvs/pkgs/rpms/guile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4905
Modified Files:
guile.spec
Log Message:
- support slib-3a5
- move slibcat and slib symlink out of site directory
- set umask in scriptlet (#242936)
Index: guile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guile/devel/guile.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- guile.spec 22 Oct 2007 15:38:31 -0000 1.55
+++ guile.spec 9 Jan 2008 15:58:52 -0000 1.56
@@ -1,7 +1,8 @@
Summary: A GNU implementation of Scheme for application extensibility
Name: guile
+%define mver 1.8
Version: 1.8.3
-Release: 1%{?dist}
+Release: 2%{?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
@@ -70,6 +71,9 @@
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
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -93,17 +97,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 +131,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 +155,11 @@
%{_includedir}/libguile.h
%changelog
+* Wed Jan 09 2008 Miroslav Lichvar <mlichvar at redhat.com> - 5:1.8.3-2
+- support slib-3a5
+- move slibcat and slib symlink out of site directory
+- set umask in scriptlet (#242936)
+
* Mon Oct 22 2007 Miroslav Lichvar <mlichvar at redhat.com> - 5:1.8.3-1
- update to 1.8.3
- Previous message (by thread): rpms/urw-fonts/devel urw-fonts.spec,1.29,1.30
- Next message (by thread): rpms/slib/devel slib-3a5-guile.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 slib.spec, 1.14, 1.15 sources, 1.4, 1.5 slib-3a4-guile.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list