diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-05-16 09:41:47 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-05-16 09:41:47 +0200 |
| commit | 2999623b1a7f9451b6201023244976dce805ed9d (patch) | |
| tree | dd6830790562c4ebc8c93325c67fbb36770d8523 | |
| parent | 71fa256b3634a0fa9b7b1194f6df33a603bd9d9d (diff) | |
Xulrunner / Firefox : use python27 SCL for EL-6 build
| -rw-r--r-- | xulrunner.spec | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/xulrunner.spec b/xulrunner.spec index 4e7cd72..2c47de7 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -26,7 +26,11 @@ %endif # Use system cairo? +%if 0%{?fedora} < 17 && 0%{?rhel} < 7 %define system_cairo 0 +%else +%define system_cairo 1 +%endif %global shortname xulrunner @@ -154,7 +158,9 @@ BuildRequires: libvpx-devel >= %{libvpx_version} %endif #BuildRequires: autoconf213 BuildRequires: yasm - +%if 0%{?rhel} == 6 +BuildRequires: python27 +%endif Requires: mozilla-filesystem Requires: liberation-sans-fonts %if %{?system_nss} @@ -229,6 +235,10 @@ Requires: mesa-libGL-devel Requires: libvpx-devel >= %{libvpx_version} %endif Requires: yasm +%if 0%{?rhel} == 6 +Requires: python27 +%endif + %description devel This package contains the libraries amd header files that are needed @@ -368,6 +378,10 @@ case "%{sqlite_build_version}" in esac %endif +%if 0%{?rhel} == 6 +. /opt/rh/python27/enable +%endif + cd %{tarballdir} # -fpermissive is needed to build with gcc 4.6+ which has become stricter @@ -418,6 +432,10 @@ make -C objdir buildsymbols #--------------------------------------------------------------------- %install +%if 0%{?rhel} == 6 +. /opt/rh/python27/enable +%endif + cd %{tarballdir} # set up our prefs before install, so it gets pulled in to omni.jar @@ -582,6 +600,7 @@ fi %changelog * Tue May 14 2013 Remi Collet <RPMS@FamilleCollet.com> - 21.0-1 - Update to 21.0, sync with rawhide +- use python27 SCL for EL-6 build * Mon May 13 2013 Martin Stransky <stransky@redhat.com> - 21.0-3 - New upstream tarball (build 4) |