[packages/iceweasel] Use system virtualenv

[baggins]

commit 6a75f2e2364b8ac35327217b0cda19ccfbc434f2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Aug 29 18:34:07 2012 +0200

    Use system virtualenv

 iceweasel.spec          |  4 ++++
 system-virtualenv.patch | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index d5ade20..14bd783 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -48,6 +48,8 @@ Patch9:		%{name}-no-subshell.patch
 Patch10:	system-cairo.patch
 Patch11:	%{name}-middle_click_paste.patch
 Patch12:	%{name}-packaging.patch
+# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
+Patch13:	system-virtualenv.patch
 URL:		http://www.pld-linux.org/Packages/Iceweasel
 BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	OpenGL-devel
@@ -81,6 +83,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig(libffi) >= 3.0.9
 BuildRequires:	python-modules
 %{?with_pgo:BuildRequires:	python-modules-sqlite}
+BuildRequires:	python-virtualenv
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	sqlite3-devel >= 3.7.10
@@ -164,6 +167,7 @@ cd mozilla
 %patch10 -p2
 %patch11 -p2
 %patch12 -p2
+%patch13 -p2
 
 # config/rules.mk is patched by us and js/src/config/rules.mk
 # is supposed to be exact copy
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
new file mode 100644
index 0000000..bc76d83
--- /dev/null
+++ b/system-virtualenv.patch
@@ -0,0 +1,24 @@
+Restore --system-site-packages when system virtualenv gets 1.7 upgrade
+
+--- xulrunner-15.0/mozilla/configure.in~	2012-08-29 11:06:34.517985819 +0200
++++ xulrunner-15.0/mozilla/configure.in	2012-08-29 11:23:47.234616054 +0200
+@@ -9069,7 +9069,7 @@
+ AC_MSG_RESULT([Creating Python virtualenv])
+ rm -rf _virtualenv
+ mkdir -p _virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
++MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+ case "$host_os" in
+ mingw*)
+     PYTHON=`pwd`/_virtualenv/Scripts/python.exe
+--- xulrunner-15.0/mozilla/configure~	2012-08-29 11:25:28.121279162 +0200
++++ xulrunner-15.0/mozilla/configure	2012-08-29 11:27:27.981274936 +0200
+@@ -25468,7 +25468,7 @@
+ echo "$ac_t""Creating Python virtualenv" 1>&6
+ rm -rf _virtualenv
+ mkdir -p _virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
++MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+ case "$host_os" in
+ mingw*)
+     PYTHON=`pwd`/_virtualenv/Scripts/python.exe
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/6a75f2e2364b8ac35327217b0cda19ccfbc434f2