[sbcl] 1.0.54

Tue Jan 17 16:53:46 UTC 2012

commit 5f4f3faf8090dc51f4b2c196809dbac9bc4ce704
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 17 10:53:45 2012 -0600

    1.0.54

 .gitignore                  |    6 +--
 sbcl-1.0.2-permissive.patch |   11 -------
 sbcl-1.0.52-optflags.patch  |   71 -------------------------------------------
 sbcl-1.0.54-optflags.patch  |   69 +++++++++++++++++++++++++++++++++++++++++
 sbcl.spec                   |   18 ++++-------
 sources                     |    4 +-
 6 files changed, 79 insertions(+), 100 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 442a2f9..91686ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,5 @@
 /sbcl-1.0.46-source.tar.bz2
 /sbcl-1.0.51-documentation-html.tar.bz2
 /sbcl-1.0.51-source.tar.bz2
-/sbcl-1.0.52-documentation-html.tar.bz2
-/sbcl-1.0.52-source.tar.bz2
-/sbcl-1.0.53-documentation-html.tar.bz2
-/sbcl-1.0.53-source.tar.bz2
+/sbcl-1.0.54-documentation-html.tar.bz2
+/sbcl-1.0.54-source.tar.bz2
diff --git a/sbcl-1.0.54-optflags.patch b/sbcl-1.0.54-optflags.patch
new file mode 100644
index 0000000..ec82d9f
--- /dev/null
+++ b/sbcl-1.0.54-optflags.patch
@@ -0,0 +1,69 @@
+diff -up sbcl-1.0.54/contrib/asdf-module.mk.optflags sbcl-1.0.54/contrib/asdf-module.mk
+--- sbcl-1.0.54/contrib/asdf-module.mk.optflags	2011-12-04 17:09:01.000000000 -0600
++++ sbcl-1.0.54/contrib/asdf-module.mk	2012-01-17 10:51:18.085029484 -0600
+@@ -23,6 +23,8 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME
+   CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
+ endif
+ 
++EXTRA_CFLAGS += $(RPM_OPT_FLAGS)
++
+ export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
+ 
+ all: $(EXTRA_ALL_TARGETS)
+diff -up sbcl-1.0.54/src/runtime/Config.ppc-linux.optflags sbcl-1.0.54/src/runtime/Config.ppc-linux
+--- sbcl-1.0.54/src/runtime/Config.ppc-linux.optflags	2011-12-04 17:09:01.000000000 -0600
++++ sbcl-1.0.54/src/runtime/Config.ppc-linux	2012-01-17 10:51:47.671659598 -0600
+@@ -9,7 +9,7 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+ 
+-CFLAGS = -g -m32
++CFLAGS += -g -m32
+ LINKFLAGS += -v -rdynamic -m32
+ NM = ./linux-nm
+ 
+@@ -19,6 +19,8 @@ ARCH_SRC = ppc-arch.c
+ OS_SRC = linux-os.c ppc-linux-os.c
+ OS_LIBS = -ldl
+ 
++CFLAGS += $(RPM_OPT_FLAGS)
++
+ ifdef LISP_FEATURE_GENCGC
+   GC_SRC = gencgc.c
+ else
+diff -up sbcl-1.0.54/src/runtime/Config.sparc-linux.optflags sbcl-1.0.54/src/runtime/Config.sparc-linux
+--- sbcl-1.0.54/src/runtime/Config.sparc-linux.optflags	2011-12-04 17:09:01.000000000 -0600
++++ sbcl-1.0.54/src/runtime/Config.sparc-linux	2012-01-17 10:51:18.086029472 -0600
+@@ -22,6 +22,8 @@ ifdef LISP_FEATURE_SB_CORE_COMPRESSION
+   OS_LIBS += -lz
+ endif
+ 
++CFLAGS += $(RPM_OPT_FLAGS)
++
+ GC_SRC = cheneygc.c
+ 
+ # Nothing to do for after-grovel-headers.
+diff -up sbcl-1.0.54/src/runtime/Config.x86_64-linux.optflags sbcl-1.0.54/src/runtime/Config.x86_64-linux
+--- sbcl-1.0.54/src/runtime/Config.x86_64-linux.optflags	2011-12-04 17:09:01.000000000 -0600
++++ sbcl-1.0.54/src/runtime/Config.x86_64-linux	2012-01-17 10:51:18.087029460 -0600
+@@ -44,6 +44,8 @@ endif
+ 
+ CFLAGS += -fno-omit-frame-pointer
+ 
++CFLAGS += $(RPM_OPT_FLAGS)
++
+ GC_SRC = gencgc.c
+ 
+ # Nothing to do for after-grovel-headers.
+diff -up sbcl-1.0.54/src/runtime/Config.x86-linux.optflags sbcl-1.0.54/src/runtime/Config.x86-linux
+--- sbcl-1.0.54/src/runtime/Config.x86-linux.optflags	2011-12-04 17:09:01.000000000 -0600
++++ sbcl-1.0.54/src/runtime/Config.x86-linux	2012-01-17 10:51:18.087029460 -0600
+@@ -42,6 +42,8 @@ ifdef LISP_FEATURE_SB_CORE_COMPRESSION
+   OS_LIBS += -lz
+ endif
+ 
++CFLAGS += $(RPM_OPT_FLAGS)
++
+ GC_SRC = gencgc.c
+ 
+ # Nothing to do for after-grovel-headers.
diff --git a/sbcl.spec b/sbcl.spec
index 36babbf..b2eb889 100644
--- a/sbcl.spec
+++ b/sbcl.spec
@@ -1,6 +1,6 @@
 
 %if 0%{?fedora} > 9 || 0%{?rhel} > 5
-%define common_lisp_controller 1
+#define common_lisp_controller 1
 %endif
 
 # generate/package docs
@@ -17,8 +17,8 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 1.0.53
-Release: 2%{?dist}
+Version: 1.0.54
+Release: 1%{?dist}
 
 License: BSD
 Group: 	 Development/Languages
@@ -80,10 +80,8 @@ Source202: sbcl-install-clc.lisp
 %endif
 
 Patch2: sbcl-0.9.5-personality.patch
-Patch3: sbcl-1.0.52-optflags.patch
+Patch3: sbcl-1.0.54-optflags.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
-# Allow override of contrib test failure(s)
-Patch7: sbcl-1.0.2-permissive.patch
 
 ## upstreamable patches
 Patch50: sbcl-1.0.51-generate_version.patch
@@ -118,7 +116,6 @@ fi
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
-%patch7 -p1 -b .permissive
 %patch50 -p1 -b .generate_version
 
 # "install" local bootstrap
@@ -144,9 +141,6 @@ export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
 export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
 %endif
 
-# WORKAROUND sb-concurrency test failures in koji/mock
-touch contrib/sb-concurrency/test-passed
-
 export SBCL_HOME=%{_prefix}/lib/sbcl
 %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
 %{?sbcl_shell} \
@@ -249,8 +243,8 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.53-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Mon Dec 05 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.54-1
+- 1.0.54
 
 * Mon Nov 07 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.53-1
 - 1.0.53
diff --git a/sources b/sources
index cecd5f2..8cb6c1e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9d73218c06515390c8360b675b6d67bf  sbcl-1.0.53-documentation-html.tar.bz2
-28bdb8d65b240bcc45370f19b781f9b8  sbcl-1.0.53-source.tar.bz2
+9fa77e679d7992d19f99a918ed66f4cd  sbcl-1.0.54-documentation-html.tar.bz2
+b7e956a71d603bb714f71c2f7ef350f6  sbcl-1.0.54-source.tar.bz2
