The package rpms/pypy.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/pypy.git/commit/?id=e72eb172f138f....
Change:
+ExcludeArch: aarch64
Thanks.
Full change:
============
commit 69c77381fb08a47d5f682860cf2f9cc8fbb4b09b
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri Mar 1 09:57:39 2019 +0100
Fedora CI: Workaround for fedora-ci/general #31
https://pagure.io/fedora-ci/general/issue/31
diff --git a/tests/tests.yml b/tests/tests.yml
index 29903dd..fcafe09 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -13,6 +13,6 @@
run: METHOD=virtualenv PYTHON=pypy VERSION=2.7 ./venv.sh
required_packages:
- gcc
- - /usr/bin/virtualenv
+ - virtualenv
- python3-tox
- pypy-devel
commit e72eb172f138f5c2276b77a025f2add0c1086251
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri Mar 1 09:56:54 2019 +0100
Reenable power (#1619690)
diff --git a/pypy.spec b/pypy.spec
index 2fca42a..b4dc7f2 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -13,8 +13,7 @@ License: MIT and Python and UCD
URL:
http://pypy.org/
# aarch64: Not available yet
-# ppc64: Broken on F29+
https://bugzilla.redhat.com/show_bug.cgi?id=1619690
-ExcludeArch: aarch64 %{power64}
+ExcludeArch: aarch64
# High-level configuration of the build:
commit 311cac57f2b6e10c1b8fe1577df9c07417fadfdb
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri Mar 1 00:07:40 2019 +0100
Update to 7.0.0
diff --git a/.gitignore b/.gitignore
index d7feae3..939740f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/pypy-*-src.tar.bz2
/pypy2-*-src.tar.bz2
+/pypy2.7-v7.0.0-src.tar.bz2
diff --git a/009-add-libxcrypt-support.patch b/009-add-libxcrypt-support.patch
index f1df62c..f3c9a7d 100644
--- a/009-add-libxcrypt-support.patch
+++ b/009-add-libxcrypt-support.patch
@@ -1,10 +1,10 @@
diff --git a/pypy/module/crypt/interp_crypt.py b/pypy/module/crypt/interp_crypt.py
-index d227b6a..da969e6 100644
+index bd13f6f..1022c9e 100644
--- a/pypy/module/crypt/interp_crypt.py
+++ b/pypy/module/crypt/interp_crypt.py
-@@ -6,7 +6,7 @@ import sys
- if sys.platform.startswith('darwin'):
- eci = ExternalCompilationInfo()
+@@ -9,7 +9,7 @@ elif sys.platform.startswith('linux'):
+ # crypt() is defined only in crypt.h on some Linux variants (eg. Fedora 28)
+ eci = ExternalCompilationInfo(libraries=['crypt'],
includes=["crypt.h"])
else:
- eci = ExternalCompilationInfo(libraries=['crypt'])
+ eci = ExternalCompilationInfo(libraries=['crypt'],
includes=['crypt.h'])
diff --git a/pypy.spec b/pypy.spec
index 0127710..2fca42a 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -1,7 +1,8 @@
-%global basever 6.0
+%global basever 7.0
Name: pypy
Version: %{basever}.0
-Release: 5%{?dist}
+%global pyversion 2.7
+Release: 1%{?dist}
Summary: Python implementation with a Just-In-Time compiler
# LGPL and another free license we'd need to ask spot about are present in some
@@ -142,7 +143,7 @@ ExcludeArch: aarch64 %{power64}
%(echo '%{__os_install_post}' | sed -e
's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
# Source and patches:
-Source0:
https://bitbucket.org/pypy/pypy/downloads/%{src_name}.tar.bz2
+Source0:
https://bitbucket.org/pypy/pypy/downloads/pypy%{pyversion}-v%{version}-sr...
# Supply various useful RPM macros for building python modules against pypy:
# __pypy, pypy_sitelib, pypy_sitearch
@@ -246,6 +247,8 @@ BuildRequires: python-pip-wheel
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Provides: %{ver_name} = %{version}-%{release}
Provides: %{ver_name}%{_isa} = %{version}-%{release}
+Provides: pypy%{pyversion} = %{version}-%{release}
+Provides: pypy%{pyversion}%{_isa} = %{version}-%{release}
Provides: %{ver_name}(abi) = %{basever}
%description
@@ -280,6 +283,9 @@ Provides: bundled(python3-setuptools) = 28.8.0
Provides: %{ver_name}-libs = %{version}-%{release}
Provides: %{ver_name}-libs%{_isa} = %{version}-%{release}
+Provides: pypy%{pyversion}-libs = %{version}-%{release}
+Provides: pypy%{pyversion}-libs%{_isa} = %{version}-%{release}
+
%description libs
Libraries required by the various PyPy implementations of Python.
@@ -289,6 +295,8 @@ Summary: Development tools for working with PyPy
Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: %{ver_name}-devel = %{version}-%{release}
Provides: %{ver_name}-devel%{_isa} = %{version}-%{release}
+Provides: pypy%{pyversion}-devel = %{version}-%{release}
+Provides: pypy%{pyversion}-devel%{_isa} = %{version}-%{release}
%description devel
Header files for building C extension modules against PyPy
@@ -300,13 +308,15 @@ Summary: Stackless Python interpreter built using PyPy
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Provides: %{ver_name}-stackless = %{version}-%{release}
Provides: %{ver_name}-stackless%{_isa} = %{version}-%{release}
+Provides: pypy%{pyversion}-stackless = %{version}-%{release}
+Provides: pypy%{pyversion}-stackless%{_isa} = %{version}-%{release}
%description stackless
Build of PyPy with support for micro-threads for massive concurrency
%endif
%prep
-%autosetup -n %{src_name} -p1 -S git
+%autosetup -n pypy%{pyversion}-v%{version}-src -p1 -S git
%if %{with rpmwheels}
%apply_patch -m %(basename %{SOURCE189}) %{SOURCE189}
@@ -796,6 +806,9 @@ CheckPyPy %{name}-c-stackless
%changelog
+* Thu Feb 28 2019 Miro Hronok <mhroncok(a)redhat.com> - 7.0.0-1
+- Update to 7.0.0
+
* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0.0-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index f7763ba..4f57c76 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pypy2-v6.0.0-src.tar.bz2) =
d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
+SHA512 (pypy2.7-v7.0.0-src.tar.bz2) =
7fb5682ee4226af51008f50a81c922e44c231410fe36b7656efa20f22c855ba30a01bc96ee897b4c7a02941d37a405c922b09855977313878e34aaad6bf023dc