Update to 2.6.1

This commit is contained in:
Michal Cyprian 2015-09-01 10:05:53 +02:00
parent 71c3306085
commit abb087e880
4 changed files with 7 additions and 20 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@
/pypy-2.4.0-src.tar.bz2
/pypy-2.5.0-src.tar.bz2
/pypy-2.6.0-src.tar.bz2
/pypy-2.6.1-src.tar.bz2

View File

@ -1,6 +1,6 @@
Name: pypy
Version: 2.6.0
Release: 5%{?dist}
Version: 2.6.1
Release: 1%{?dist}
Summary: Python implementation with a Just-In-Time compiler
Group: Development/Languages
@ -153,9 +153,6 @@ Patch1: 006-always-log-stdout.patch
# community that won't make sense outside of it). [Sorry to be a killjoy]
Patch2: 007-remove-startup-message.patch
# Fix bug in pypy installing script package.py
Patch3: pypy_tool_release_package.patch
# Build-time requirements:
# pypy's can be rebuilt using itself, rather than with CPython; doing so
@ -274,7 +271,6 @@ Build of PyPy with support for micro-threads for massive concurrency
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Replace /usr/local/bin/python shebangs with /usr/bin/python:
find -name "*.py" -exec \
sed \
@ -717,6 +713,9 @@ CheckPyPy %{name}-c-stackless
%changelog
* Mon Aug 31 2015 Michal Cyprian <mcyprian@redhat.com> - 2.6.1-1
- Upgrade to 2.6.1
* Wed Aug 26 2015 Michal Cyprian <mcyprian@redhat.com> - 2.6.0-5
- Use %{bootstrap_python_interp} macro to run package.py

View File

@ -1,13 +0,0 @@
diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
index de6fdbd..4c0b6a2 100755
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -135,7 +135,7 @@ def create_package(basedir, options, _fake=False):
'not find it' % (str(libpypy_c),))
binaries.append((libpypy_c, libpypy_name))
#
- builddir = options.builddir
+ builddir = py.path.local(options.builddir)
pypydir = builddir.ensure(name, dir=True)
includedir = basedir.join('include')
# Recursively copy all headers, shutil has only ignore

View File

@ -1 +1 @@
b36346a77131c76276644671d68124d9 pypy-2.6.0-src.tar.bz2
7e53f72eeb6d9947fd5db6872213404d pypy-2.6.1-src.tar.bz2