- up to 2.16

diff --git a/seamonkey-system-virtualenv.patch b/seamonkey-system-virtualenv.patch
index a69cd1a28f7a10c860756adc5130bced67a80432..b3c0241fdcf31913d9eef328cdcec2217196c969 100644 (file)
--- a/seamonkey-system-virtualenv.patch
+++ b/seamonkey-system-virtualenv.patch
@@ -1,24 +1,48 @@
-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
+--- seamonkey-2.16/comm-release/configure.in.orig      2013-02-26 17:12:02.382212561 +0100
++++ seamonkey-2.16/comm-release/configure.in   2013-02-26 17:27:28.185507042 +0100
+@@ -138,8 +138,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/mozilla/build/virtualenv/populate_virtualenv.py \
+-    $_topsrcdir/mozilla $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
+--- seamonkey-2.16/comm-release/configure.orig 2013-02-26 17:12:02.408879226 +0100
++++ seamonkey-2.16/comm-release/configure      2013-02-26 17:28:26.278837941 +0100
+@@ -1096,8 +1096,7 @@
+ fi
+ 
+ echo "$ac_t""Creating Python environment" 1>&6
+-$PYTHON $_topsrcdir/mozilla/build/virtualenv/populate_virtualenv.py \
+-    $_topsrcdir/mozilla $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
---- 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/comm-release/mozilla/configure.in~  2013-02-20 12:29:36.493788864 +0100
++++ xulrunner-19.0/comm-release/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
+--- xulrunner-19.0/comm-release/mozilla/configure~     2013-02-20 12:39:40.270435866 +0100
++++ xulrunner-19.0/comm-release/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

diff --git a/seamonkey.spec b/seamonkey.spec
index dd921027f62be153dc276484b2fbbd6a54def1ef..389b9881f81c0f894859cc075c23fd0a4b100152 100644 (file)
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -16,7 +16,7 @@
 %define                enigmail_ver    1.5.1
 %define                nspr_ver        4.9.3
 %define                nss_ver         3.14.1
-%define                xulrunner_ver   18.0.2
+%define                xulrunner_ver   19.0
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -28,12 +28,12 @@ Summary(es.UTF-8):  Navegador de Internet SeaMonkey Community Edition
 Summary(pl.UTF-8):     SeaMonkey Community Edition - przeglądarka WWW
 Summary(pt_BR.UTF-8):  Navegador SeaMonkey Community Edition
 Name:          seamonkey
-Version:       2.15.2
+Version:       2.16
 Release:       1
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:         X11/Applications/Networking
 Source0:       http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/%{name}-%{version}.source.tar.bz2
-# Source0-md5: 1938c5a9673e94e9f5c809f5dbfe8d29
+# Source0-md5: 29e360eae42d7a9cca7f25c1ad44f1d5
 Source1:       http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
 # Source1-md5: 3e71f84ed2c11471282412ebe4f5eb2d
 Source4:       %{name}.desktop
@@ -102,7 +102,6 @@ BuildRequires:      xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXt-devel
 %if %{with xulrunner}
 BuildRequires: xulrunner-devel >= 2:%{xulrunner_ver}
-BuildRequires: xulrunner-devel < 2:19
 %endif
 BuildRequires: yasm
 BuildRequires: zip
@@ -263,7 +262,7 @@ tar -C mailnews/extensions -zxf %{SOURCE1}
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
+%patch7 -p2
 %patch8 -p1
 %patch9 -p2
 
@@ -518,7 +517,6 @@ install -d $ext_dir/{chrome,components,defaults/preferences,modules}
 cd mozilla/dist/bin
 cp -rfLp chrome/enigmail.jar $ext_dir/chrome
 cp -rfLp components/enig* $ext_dir/components
-cp -rfLp components/libenigmime.so $ext_dir/components
 cp -rfLp defaults/preferences/enigmail.js $ext_dir/defaults/preferences
 cp -rfLp modules/{commonFuncs,enigmailCommon,keyManagement,pipeConsole,subprocess}.jsm $ext_dir/modules
 cp -rfLp modules/{subprocess_worker_unix,subprocess_worker_win}.js $ext_dir/modules
@@ -590,6 +588,7 @@ fi
 %{_libdir}/%{name}/components/ContactManager.js
 %{_libdir}/%{name}/components/FeedConverter.js
 %{_libdir}/%{name}/components/FeedWriter.js
+%{_libdir}/%{name}/components/PermissionSettings.js
 %{_libdir}/%{name}/components/SettingsManager.js
 %{_libdir}/%{name}/components/SiteSpecificUserAgent.js
 %{_libdir}/%{name}/components/TCPSocket.js
@@ -780,7 +779,6 @@ fi
 %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest
 %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf
 %dir %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components
-%attr(755,root,root) %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.so
 %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.xpt
 %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.js
 %dir %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules