- updated to 3b4 (now with proper guile 2 support)

- split into common and guile-specific part

diff --git a/slib.spec b/slib.spec
index 90d17b164086fe94d810d19d43ff7ab61bf76710..1ae861f03da9f1d9f618d1604dbf6240083b6067 100644 (file)
--- a/slib.spec
+++ b/slib.spec
@@ -1,17 +1,16 @@
+# TODO: integration with other Scheme implementations (see Makefile catalogs target)
 Summary:       Scheme library
 Summary(pl.UTF-8):     Biblioteka Scheme
 Name:          slib
-Version:       3b3
-Release:       0.1
+Version:       3b4
+Release:       1
 License:       distributable (BSD and Public Domain parts)
 Group:         Development/Languages/Scheme
 Source0:       http://groups.csail.mit.edu/mac/ftpdir/scm/%{name}-%{version}.tar.gz
-# Source0-md5: 11626eef380de4f56d3082514559beb6
+# Source0-md5: dcada65c4df4209c8f71211095bcef8e
 Patch0:                %{name}-info.patch
 URL:           http://people.csail.mit.edu/jaffer/SLIB.html
 BuildRequires: texinfo
-Requires(post):        /usr/bin/guile
-Requires:      guile >= 5:2.0
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -27,6 +26,30 @@ funkcje użytkowe dla wszystkich implementacji scheme. SLIB jest zgodne
 ze specyfikacją Revised^5 Report on the Algorithmic Language Scheme
 oraz IEEE P1178.
 
+%package -n guile-slib
+Summary:       Scheme library for Guile
+Summary(pl.UTF-8):     Biblioteka Scheme dla Guile
+Group:         Development/Languages/Scheme
+Requires(post):        /usr/bin/guile
+Requires:      %{name} = %{version}-%{release}
+Requires:      guile >= 5:2.0
+
+%description -n guile-slib
+SLIB is a portable scheme library meant to provide compatibility and
+utility functions for all standard scheme implementations. Slib
+conforms to Revised^5 Report on the Algorithmic Language Scheme and
+the IEEE P1178 specification.
+
+This package integrates SLIB with Guile implementation.
+
+%description -n guile-slib -l pl.UTF-8
+SLIB jest przenośną biblioteką scheme mającą zapewnić kompatybilność i
+funkcje użytkowe dla wszystkich implementacji scheme. SLIB jest zgodne
+ze specyfikacją Revised^5 Report on the Algorithmic Language Scheme
+oraz IEEE P1178.
+
+Ten pakiet integruje SLIB z implementacją Guile.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -36,38 +59,51 @@ oraz IEEE P1178.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_infodir},%{_datadir}/guile/slib,%{_bindir},%{_mandir}/man1}
-install *.scm $RPM_BUILD_ROOT%{_datadir}/guile/slib
-sed -e 's,/usr/lib/slib/,%{_datadir}/guile/slib/,' guile.init > $RPM_BUILD_ROOT%{_datadir}/guile/slib/guile.init
+install -d $RPM_BUILD_ROOT{%{_infodir},%{_datadir}/slib,%{_bindir},%{_mandir}/man1}
+
+cp -p *.scm $RPM_BUILD_ROOT%{_datadir}/slib
+cp -p guile.init guile-2.init $RPM_BUILD_ROOT%{_datadir}/slib
+# TODO (and possibly other, not present yet in PLD)
+#cp -p scheme48.init umbscheme.init $RPM_BUILD_ROOT%{_datadir}/slib
+
 cat > $RPM_BUILD_ROOT%{_bindir}/slib <<EOF
 #!/bin/sh
-SCHEME_LIBRARY_PATH=%{_datadir}/guile/slib/
+SCHEME_LIBRARY_PATH=%{_datadir}/slib/
 EOF
 cat slib.sh >>$RPM_BUILD_ROOT%{_bindir}/slib
+
 install slib.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install slib.info $RPM_BUILD_ROOT%{_infodir}
 
+install -d $RPM_BUILD_ROOT%{_datadir}/guile/site/2.0
+:> $RPM_BUILD_ROOT%{_datadir}/guile/site/2.0/slibcat
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-umask 022
-rm -f %{_datadir}/guile/slibcat
-/usr/bin/guile -l %{_datadir}/guile/slib/guile.init -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
-
-%preun
-if [ "$1" = "0" ]; then
-       rm -f %{_datadir}/guile/site/slibcat
-fi
+%post  -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %postun        -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
+%post -n guile-slib
+# old (guile < 2) location
+rm -f %{_datadir}/guile/site/slibcat
+umask 022
+/usr/bin/guile -l %{_datadir}/slib/guile.init -c "(use-modules (ice-9 slib)) (require 'new-catalog)" >/dev/null 2>&1
+
 %files
 %defattr(644,root,root,755)
-%doc ANNOUNCE COPYING ChangeLog FAQ README *.init
+%doc ANNOUNCE COPYING ChangeLog FAQ README
 %attr(755,root,root) %{_bindir}/slib
-%{_datadir}/guile/slib
+%dir %{_datadir}/slib
+%{_datadir}/slib/*.scm
 %{_mandir}/man1/slib.1*
 %{_infodir}/slib.info*
+
+%files -n guile-slib
+%defattr(644,root,root,755)
+%{_datadir}/slib/guile.init
+%{_datadir}/slib/guile-2.init
+%ghost %{_datadir}/guile/site/2.0/slibcat