#22 Add virtual provides for the bundled libmpdec (rhbz#1943359)
Merged 3 years ago by churchyard. Opened 3 years ago by cstratak.
rpms/ cstratak/pypy3 rawhide  into  f33

file modified
+27 -1
@@ -2,7 +2,7 @@ 

  Name:           pypy3

  Version:        %{basever}.1

  %global pyversion 3.6

- Release:        3%{?dist}

+ Release:        5%{?dist}

  Summary:        Python 3 implementation with a Just-In-Time compiler

  

  # LGPL and another free license we'd need to ask spot about are present in some
@@ -14,6 +14,13 @@ 

  

  # High-level configuration of the build:

  

+ # libmpdec (mpdecimal package in Fedora) is tightly coupled with the

+ # decimal module. We keep it bundled as to avoid incompatibilities

+ # with the packaged version.

+ # The version information can be found at lib_pypy/_libmpdec/mpdecimal.h

+ # defined as MPD_VERSION.

+ %global libmpdec_version 2.4.1

+ 

  # Whether to use RPM build wheels from the python-{pip,setuptools}-wheel package

  # Uses upstream bundled prebuilt wheels otherwise

  %bcond_without rpmwheels
@@ -276,6 +283,10 @@ 

  Provides: bundled(python3-setuptools) = 44.0.0

  %endif

  

+ # Provides for the bundled libmpdec

+ Provides: bundled(mpdecimal) = %{libmpdec_version}

+ Provides: bundled(libmpdec) = %{libmpdec_version}

+ 

  %description libs

  Libraries required by the various PyPy implementations of Python 3.

  
@@ -306,6 +317,8 @@ 

  %prep

  %autosetup -n pypy%{pyversion}-v%{version}-src -p1 -S git

  

+ # Temporary workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1954999

+ %{?!apply_patch:%define apply_patch(qp:m:) {%__apply_patch %**}}

  

  %if %{with rpmwheels}

  %apply_patch -m %(basename %{SOURCE189}) %{SOURCE189}
@@ -691,6 +704,13 @@ 

  

  

  %check

+ 

+ # Verify that the bundled libmpdec version python was compiled with, is the same version we have virtual

+ # provides for in the SPEC.

+ test "$(%{goal_dir}/pypy3-c -c 'import decimal; print(decimal.__libmpdec_version__.decode("ascii"))')" = \

+      "%{libmpdec_version}"

+ 

+ 

  topdir=$(pwd)

  

  SkipTest() {
@@ -858,6 +878,12 @@ 

  

  

  %changelog

+ * Wed May 19 2021 Charalampos Stratakis <cstratak@redhat.com> - 7.3.1-5

+ - Add virtual provides for the bundled libmpdec (rhbz#1943359)

+ 

+ * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.1-4

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

+ 

  * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.1-3

  - Second attempt - Rebuilt for

    https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

no initial comment

Build succeeded.

Pull-Request has been merged by churchyard

3 years ago
Metadata