From 61786ae611c92104cf2d00f500ba87052f67d997 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Apr 12 2018 14:45:38 +0000
Subject: Merge master and f28


---

diff --git a/macros.pypy b/macros.pypy
index 5f40b6f..7dd90df 100644
--- a/macros.pypy
+++ b/macros.pypy
@@ -2,4 +2,4 @@
 %pypy_sitelib %(%{__pypy} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
 %pypy_sitearch %(%{__pypy} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
 %pypy_version %(%{__pypy} -c "import sys; sys.stdout.write(sys.version[:3])")
-%pypydir %{_builddir}/pypy-%{name}-%{version}-%{release}
+%pypy_pypy_version %(%{__pypy} -c "import sys; sys.stdout.write('{}.{}'.format(sys.pypy_version_info.major, sys.pypy_version_info.minor))")
diff --git a/macros.pypy2 b/macros.pypy2
new file mode 100644
index 0000000..fbebbe2
--- /dev/null
+++ b/macros.pypy2
@@ -0,0 +1,5 @@
+%__pypy2 /usr/bin/pypy2
+%pypy2_sitelib %(%{__pypy2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
+%pypy2_sitearch %(%{__pypy2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
+%pypy2_version %(%{__pypy2} -c "import sys; sys.stdout.write(sys.version[:3])")
+%pypy2_pypy_version %(%{__pypy2} -c "import sys; sys.stdout.write('{}.{}'.format(sys.pypy_version_info.major, sys.pypy_version_info.minor))")
diff --git a/pypy.spec b/pypy.spec
index d1eb2fa..0b07c7d 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -1,7 +1,7 @@
 %global basever 5.10
 Name:           pypy
 Version:        %{basever}.0
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Python implementation with a Just-In-Time compiler
 
 Group:          Development/Languages
@@ -142,7 +142,9 @@ Source0: https://bitbucket.org/pypy/pypy/downloads/%{src_name}.tar.bz2
 
 # Supply various useful RPM macros for building python modules against pypy:
 #  __pypy, pypy_sitelib, pypy_sitearch
-Source2: macros.%{name}
+Source1: macros.%{name}
+#  __pypy2, pypy2_sitelib, pypy2_sitearch
+Source2: macros.%{name}%{pymajorlibver}
 
 # Patch pypy.translator.platform so that stdout from "make" etc gets logged,
 # rather than just stderr, so that the command-line invocations of the compiler
@@ -231,6 +233,7 @@ BuildRequires:  emacs
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Provides: %{ver_name} = %{version}-%{release}
 Provides: %{ver_name}%{_isa} = %{version}-%{release}
+Provides: %{ver_name}(abi) = %{basever}
 
 %description
 PyPy's implementation of Python, featuring a Just-In-Time compiler on some CPU
@@ -586,6 +589,7 @@ chrpath --delete %{buildroot}/%{pypyprefix}/bin/%{name}
 
 # Install macros for rpm:
 mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d
+install -m 644 %{SOURCE1} %{buildroot}/%{_rpmconfigdir}/macros.d
 install -m 644 %{SOURCE2} %{buildroot}/%{_rpmconfigdir}/macros.d
 
 # Remove build script from the package
@@ -756,6 +760,7 @@ CheckPyPy %{name}-c-stackless
 %{pypy_include_dir}/*.h
 %{pypy_include_dir}/_numpypy
 %{_rpmconfigdir}/macros.d/macros.%{name}
+%{_rpmconfigdir}/macros.d/macros.%{name}%{pymajorlibver}
 
 %if 0%{with_stackless}
 %files stackless
@@ -766,6 +771,12 @@ CheckPyPy %{name}-c-stackless
 
 
 %changelog
+* Wed Apr 11 2018 Miro Hrončok <mhroncok@redhat.com> - 5.10.0-4
+- Provide pypy2(abi) = 5.10
+
+* Tue Apr 10 2018 Miro Hrončok <mhroncok@redhat.com> - 5.10.0-3
+- RPM macros improvements
+
 * Tue Mar 27 2018 Michal Cyprian <mcyprian@redhat.com> - 5.10.0-2
 - Remove the rightmost version number from the path
 - rhbz#1516885: https://bugzilla.redhat.com/show_bug.cgi?id=1516885