From 42bdeba67997bd172d40ed4104e878efc2286ef4 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Jul 23 2008 11:02:43 +0000
Subject: - update to 3b1

- replace slib paths only in .init files

---

diff --git a/.cvsignore b/.cvsignore
index 23aff83..3b94d18 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-slib3a4.zip
+slib-3b1.zip
diff --git a/slib-3a4-guile.patch b/slib-3a4-guile.patch
deleted file mode 100644
index 538eaeb..0000000
--- a/slib-3a4-guile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- slib/guile.init.guile	2007-01-23 14:11:56.000000000 +0100
-+++ slib/guile.init	2007-01-23 14:11:56.000000000 +0100
-@@ -44,8 +44,8 @@
- ;;; the directory where any auxillary files to your Scheme
- ;;; implementation reside.
- (define implementation-vicinity
--  (let* ((path (or (%search-load-path "ice-9/q.scm")
--		   (error "Could not find ice-9/q.scm in " %load-path)))
-+  (let* ((path (or (%search-load-path "slib/qp.scm")
-+		   (error "Could not find slib/qp.scm in " %load-path)))
- 	 (vic (substring path 0 (- (string-length path) 11))))
-     (lambda () vic)))
- 
---- slib/require.scm.guile	2007-01-23 14:11:56.000000000 +0100
-+++ slib/require.scm	2007-01-23 14:32:36.000000000 +0100
-@@ -122,7 +122,7 @@
- 	  (else (bail expression))))
-   (feval expression))
- ;@
--(define (provided? expression)
-+(set! provided? (lambda (expression)
-   (define feature-list (cons (scheme-implementation-type)
- 			     (cons (software-type) slib:features)))
-   (define (provided? expression)
-@@ -131,7 +131,7 @@
- 	     (let ((path (catalog:get expression)))
- 	       (cond ((symbol? path) (provided? path))
- 		     (else #f))))))
--  (feature-eval expression provided?))
-+  (feature-eval expression provided?)))
- ;@
- (define (require feature)
-   (cond
-@@ -169,9 +169,9 @@
- (define (require-if feature? feature)
-   (if (slib:provided? feature?) (slib:require feature)))
- ;@
--(define (provide feature)
-+(set! provide (lambda (feature)
-   (if (not (memq feature slib:features))
--      (set! slib:features (cons feature slib:features))))
-+      (set! slib:features (cons feature slib:features)))))
- 
- ;@
- (define slib:provide provide)
diff --git a/slib-3b1-guile.patch b/slib-3b1-guile.patch
new file mode 100644
index 0000000..7d76edf
--- /dev/null
+++ b/slib-3b1-guile.patch
@@ -0,0 +1,15 @@
+diff -up slib/guile.init.guile slib/guile.init
+--- slib/guile.init.guile	2007-12-24 05:33:08.000000000 +0100
++++ slib/guile.init	2008-02-14 15:17:54.000000000 +0100
+@@ -53,7 +53,10 @@
+ (define implementation-vicinity
+   (cond ((and (defined? 'getenv) (getenv "GUILE_IMPLEMENTATION_PATH"))
+ 	 => (lambda (path) (lambda () path)))
+-	(else %site-dir)))
++	(else (let* ((path (or (%search-load-path "slib/qp.scm")
++			    (error "Could not find slib/qp.scm in " %load-path)))
++		     (vic (substring path 0 (- (string-length path) 11))))
++	       (lambda () vic)))))
+ 
+ ;;; (library-vicinity) should be defined to be the pathname of the
+ ;;; directory where files of Scheme library functions reside.
diff --git a/slib.spec b/slib.spec
index 7d30f0a..9e133e7 100644
--- a/slib.spec
+++ b/slib.spec
@@ -1,12 +1,12 @@
 Summary:      Platform independent library for scheme
 Name:         slib
-Version:      3a4
-Release:      2%{?dist}
+Version:      3b1
+Release:      1%{?dist}
 License:      SLIB
 Group:        Development/Languages
 BuildArch:    noarch
-Source0:      ftp://swissnet.ai.mit.edu/pub/scm/slib%{version}.zip
-Patch1:       slib-3a4-guile.patch
+Source0:      http://swiss.csail.mit.edu/ftpdir/scm/slib-%{version}.zip
+Patch1:       slib-3b1-guile.patch
 URL:          http://swissnet.ai.mit.edu/~jaffer/SLIB.html
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
@@ -23,12 +23,7 @@ implementation, user, or directory.
 %prep
 %setup -q -n %{name}
 %patch1 -p1 -b .guile
-for i in *; do
-  sed -e "s,/usr/local/lib,%{_datadir},g" \
-      -e "s,/usr/lib,%{_datadir},g" \
-      -e "s,/usr/local,/usr,g" < "${i}" > "${i}.tmp"
-  mv "${i}.tmp" "${i}"
-done
+sed -r -i "s,/usr/(local/)?lib/slib,%{_datadir}/slib,g" *.init
 
 %build
 
@@ -60,6 +55,10 @@ fi
 %{_infodir}/slib.*
 
 %changelog
+* Wed Jul 23 2008 Miroslav Lichvar <mlichvar@redhat.com> 3b1-1
+- update to 3b1
+- replace slib paths only in .init files
+
 * Fri Jun 22 2007 Miroslav Lichvar <mlichvar@redhat.com> 3a4-2
 - fix summary and buildroot (#226421)
 
diff --git a/sources b/sources
index 98ca0d4..5a7838c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0df4089264fd248c9c4f6d2e074b9f6  slib3a4.zip
+9622df4aba2fde24eeb4456d97c5add1  slib-3b1.zip