From 311cac57f2b6e10c1b8fe1577df9c07417fadfdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 1 Mar 2019 00:07:40 +0100
Subject: [PATCH] Update to 7.0.0

---
 .gitignore                      |  1 +
 009-add-libxcrypt-support.patch |  8 ++++----
 pypy.spec                       | 21 +++++++++++++++++----
 sources                         |  2 +-
 4 files changed, 23 insertions(+), 9 deletions(-)

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}-src.tar.bz2
 
 # 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 Hrončok <mhroncok@redhat.com> - 7.0.0-1
+- Update to 7.0.0
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@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