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

diff --git a/firefox-system-virtualenv.patch b/firefox-system-virtualenv.patch
index d5a6ae6370dbec76a24973281ca6905255760c2a..0abe1b22d0999fca9f30bb156932527d29dd7faa 100644 (file)
--- 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')

diff --git a/firefox.spec b/firefox.spec
index 4a3540f6416baf94993ba62e110d40290e0d9a91..63d46eaf8515a817dff52dea49fd2c24597dab59 100644 (file)
--- 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