rpms/sbcl/devel .cvsignore, 1.40, 1.41 sbcl.spec, 1.97, 1.98 sources, 1.41, 1.42

Rex Dieter rdieter at fedoraproject.org
Thu Oct 2 19:03:45 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14397

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Thu Oct 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.21-1
- sbcl-1.0.21
- common-lisp-controller bits f10+ only (for now)
- drop never-used min_bootstrap crud



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	2 Sep 2008 14:25:41 -0000	1.40
+++ .cvsignore	2 Oct 2008 19:03:15 -0000	1.41
@@ -1 +1 @@
-sbcl-1.0.20-source.tar.bz2
+sbcl-1.0.21-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sbcl.spec	26 Sep 2008 18:43:25 -0000	1.97
+++ sbcl.spec	2 Oct 2008 19:03:15 -0000	1.98
@@ -1,7 +1,7 @@
 
-# build only a minimal sbcl whose sole-purpose is to be bootstrap
-# for a future sbcl build
-#define min_bootstrap 1
+%if 0%{?fedora} > 9
+%define common_lisp_controller 1
+%endif
 
 # define to enable verbose build for debugging
 #define sbcl_verbose 1 
@@ -12,8 +12,8 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 1.0.20
-Release: 3%{?dist}
+Version: 1.0.21
+Release: 1%{?dist}
 
 License: BSD
 Group: 	 Development/Languages
@@ -27,9 +27,6 @@
 ExclusiveArch: i386 x86_64 ppc sparcv9
 %endif
 
-BuildRequires: common-lisp-controller
-Requires:      common-lisp-controller
-
 # Pre-generated html docs (not used)
 #Source1: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
@@ -74,9 +71,15 @@
 
 Source100: my_setarch.c
 
+%if 0%{?common_lisp_controller}
+BuildRequires: common-lisp-controller
+Requires:      common-lisp-controller
+Requires(post): common-lisp-controller
+Requires(preun): common-lisp-controller
 Source200: sbcl.sh
 Source201: sbcl.rc
 Source202: sbcl-install-clc.lisp
+%endif
 
 Patch1: sbcl-1.0.19-default-sbcl-home.patch
 Patch2: sbcl-0.9.5-personality.patch
@@ -161,9 +164,7 @@
 %{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
 
 # docs
-%if "x%{?min_bootstrap}" == "x%{nil}"
 make -C doc/manual html info
-%endif
 
 
 %check
@@ -197,6 +198,14 @@
 export LIB_DIR=%{buildroot}%{_libdir} 
 %{?sbcl_shell} ./install.sh 
 
+%if 0%{?common_lisp_controller}
+install -m744 -p -D %{SOURCE200} %{buildroot}%{_libdir}/common-lisp/bin/sbcl.sh
+install -m644 -p -D %{SOURCE201} %{buildroot}%{_sysconfdir}/sbcl.rc
+install -m644 -p -D %{SOURCE202} %{buildroot}%{_libdir}/sbcl/install-clc.lisp
+# linking ok? -- Rex
+cp -p %{buildroot}%{_libdir}/sbcl/sbcl.core %{buildroot}%{_libdir}/sbcl/sbcl-dist.core
+%endif
+
 ## Unpackaged files
 rm -rf %{buildroot}%{_docdir}/sbcl
 rm -f  %{buildroot}%{_infodir}/dir
@@ -206,15 +215,7 @@
 # 'test-passed' files from %%check
 find %{buildroot} -name 'test-passed' | xargs rm -vf
 
-install -dm 755 %{buildroot}%{_libdir}/common-lisp/bin
-install -m 744 %{SOURCE200} %{buildroot}%{_libdir}/common-lisp/bin
-install -dm 755 %{buildroot}%{_sysconfdir}
-install -m 644 %{SOURCE201} %{buildroot}%{_sysconfdir}/sbcl.rc
-install -dm 755 %{buildroot}%{_libdir}/sbcl
-install -m 644 %{SOURCE202} %{buildroot}%{_libdir}/sbcl/install-clc.lisp
-cp %{buildroot}%{_libdir}/sbcl/sbcl.core %{buildroot}%{_libdir}/sbcl/sbcl-dist.core
 
-%if "x%{?min_bootstrap}" == "x%{nil}"
 %post
 /sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||:
 /sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||:
@@ -226,12 +227,6 @@
   /sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir ||:
   /usr/sbin/unregister-common-lisp-implementation sbcl > /dev/null 2>&1 ||:
 fi
-%else
-%pre
-# min_bootstrap: We *could* check for only-on-upgrade, but why bother?   (-:
-/sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir >& /dev/null ||:
-/sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir >& /dev/null ||:
-%endif
 
 
 %files
@@ -241,10 +236,10 @@
 %{_bindir}/*
 %{_libdir}/sbcl/
 %{_mandir}/man?/*
-%if "x%{?min_bootstrap}" == "x%{nil}"
 %doc doc/manual/sbcl
 %doc doc/manual/asdf
 %{_infodir}/*
+%if 0%{?common_lisp_controller}
 %{_libdir}/common-lisp/bin/*
 %{_sysconfdir}/*
 %endif
@@ -255,6 +250,11 @@
 
 
 %changelog
+* Thu Oct 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.21-1
+- sbcl-1.0.21
+- common-lisp-controller bits f10+ only (for now)
+- drop never-used min_bootstrap crud
+
 * Mon Sep 22 2008 Anthony Green <green at redhat.com> - 1.0.20-3
 - Create missing directories.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	2 Sep 2008 14:25:41 -0000	1.41
+++ sources	2 Oct 2008 19:03:15 -0000	1.42
@@ -1 +1 @@
-b1101a7d64f66b943c3e6a7991de68f4  sbcl-1.0.20-source.tar.bz2
+a2993a99c848fa5631363e12fb4688b3  sbcl-1.0.21-source.tar.bz2




More information about the fedora-extras-commits mailing list