[packages/xulrunner] Up to 19.0

[mmazur]

commit f7e1b733d9eca4ac555aa1e089f24c617013615c
Author: Mariusz Mazur <mmazur at pld-linux.org>
Date:   Wed Feb 20 14:36:48 2013 +0100

    Up to 19.0

 system-virtualenv.patch | 42 +++++++++++++++++++++---------------------
 xulrunner.spec          |  5 +++--
 2 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 96588af..5f4cfdb 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -23,7 +23,7 @@
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
-Version:	18.0.1
+Version:	19.0
 Release:	1
 Epoch:		2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
@@ -31,7 +31,7 @@ Group:		X11/Applications
 # Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so lets use it
 # instead of waiting for mozilla to copy file on ftp.
 Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5:	8b400555fc7063163e3b99472d0c92a1
+# Source0-md5:	3dc732b6ce177792b43324f4bc7164d8
 Patch0:		%{name}-install.patch
 Patch1:		%{name}-rpath.patch
 Patch2:		%{name}-paths.patch
@@ -75,6 +75,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig(libffi) >= 3.0.9
 BuildRequires:	python >= 1:2.5
 BuildRequires:	python-virtualenv
+BuildRequires:  python-simplejson
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	sed >= 4.0
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index a69cd1a..be645d6 100644
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -1,24 +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/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
-+MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+--- xulrunner-19.0/mozilla/configure.in~	2013-02-20 12:29:36.493788864 +0100
++++ xulrunner-19.0/mozilla/configure.in	2013-02-20 12:46:55.030421705 +0100
+@@ -132,8 +132,7 @@
+ dnl This verifies our Python version is sane and ensures the Python
+ dnl virtualenv is present and up to date. It sanitizes the environment
+ dnl for us, so we don't need to clean anything out.
+-$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
+-    $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
++PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
+ 
+ dnl Create a virtualenv where we can install local Python packages
  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/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
-+MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+--- xulrunner-19.0/mozilla/configure~	2013-02-20 12:39:40.270435866 +0100
++++ xulrunner-19.0/mozilla/configure	2013-02-20 12:39:58.623768601 +0100
+@@ -1336,8 +1336,7 @@
+ fi
+ 
+ echo "$ac_t""Creating Python environment" 1>&6
+-$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
+-    $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
++PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
+ 
  case "$host_os" in
  mingw*)
-     PYTHON=`pwd`/_virtualenv/Scripts/python.exe
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/f7e1b733d9eca4ac555aa1e089f24c617013615c