[packages/firefox] - use py3 virtualenv for python3; rely on fixed python3 distutils.sysconfig.get_python_lib

qboosh qboosh at pld-linux.org
Wed Sep 30 18:26:28 CEST 2020


commit 68a640a7112249173912c1e2eb23010e54248bb8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Sep 30 18:29:19 2020 +0200

    - use py3 virtualenv for python3; rely on fixed python3 distutils.sysconfig.get_python_lib

 firefox-system-virtualenv.patch | 11 +----------
 firefox.spec                    |  7 +++----
 2 files changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/firefox.spec b/firefox.spec
index 4a3540f..63d46ea 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -307,10 +307,9 @@ BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	pkgconfig(libffi) >= 3.0.9
 BuildRequires:	pulseaudio-devel
-BuildRequires:	python-modules >= 1:2.5
-%{?with_pgo:BuildRequires:	python-modules-sqlite}
-BuildRequires:	python-simplejson
-BuildRequires:	python-virtualenv >= 15
+BuildRequires:	python3-modules >= 1:3.8.5-3
+%{?with_pgo:BuildRequires:	python3-modules-sqlite}
+BuildRequires:	python3-simplejson
 BuildRequires:	python3-virtualenv >= 16
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.601
diff --git a/firefox-system-virtualenv.patch b/firefox-system-virtualenv.patch
index d5a6ae6..0abe1b2 100644
--- a/firefox-system-virtualenv.patch
+++ b/firefox-system-virtualenv.patch
@@ -6,16 +6,7 @@
          """Path to virtualenv's own populator script."""
 -        return os.path.join(self.topsrcdir, 'third_party', 'python',
 -                            'virtualenv', 'virtualenv.py')
-+        return '/usr/bin/virtualenv-2'
++        return '/usr/bin/virtualenv-3'
  
      @property
      def bin_path(self):
-@@ -294,7 +293,7 @@
-         import distutils.sysconfig
- 
-         packages = self.packages()
--        python_lib = distutils.sysconfig.get_python_lib()
-+        python_lib = distutils.sysconfig.get_python_lib(1)
-         sitecustomize = open(
-             os.path.join(os.path.dirname(os.__file__), 'sitecustomize.py'),
-             mode='w')
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/firefox.git/commitdiff/68a640a7112249173912c1e2eb23010e54248bb8



More information about the pld-cvs-commit mailing list