[esc/f16] Gecko 2.0 fixes #688361.

[Jack Magne]

commit 6eb1654e3655ae20fd01338926d8f02f62b20d95
Author: Jack Magne <jmagne at localhost.localdomain>
Date:   Tue Nov 29 17:40:55 2011 -0800

    Gecko 2.0 fixes #688361.

 esc.spec |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/esc.spec b/esc.spec
index ec65c3f..0e15fc3 100644
--- a/esc.spec
+++ b/esc.spec
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.1.0
-Release: 13%{?dist} 
+Release: 14%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -16,6 +16,10 @@ Patch5: esc-1.1.0-fix5.patch
 Patch6: esc-1.1.0-fix6.patch
 Patch7: esc-1.1.0-fix7.patch
 Patch8: esc-1.1.0-fix8.patch
+Patch9: esc-1.1.0-fix9.patch
+Patch10: esc-1.1.0-fix10.patch
+Patch11: esc-1.1.0-fix11.patch
+Patch12: esc-1.1.0-fix12.patch
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -78,12 +82,16 @@ cryptographic smartcards.
 %patch6 -p1 -b .fix6
 %patch7 -p1 -b .fix7
 %patch8 -p1 -b .fix8
+%patch9 -p1 -b .fix9
+%patch10 -p1 -b .fix10
+%patch11 -p1 -b .fix11
+%patch12 -p1 -b .fix12
 
 %build
 
-GECKO_SDK_PATH=%{_libdir}/xulrunner-sdk-1.9.2/sdk
-GECKO_BIN_PATH=%{_libdir}/xulrunner-1.9.2
-GECKO_INCLUDE_PATH=%{_includedir}/xulrunner-sdk-1.9.2
+GECKO_SDK_PATH=%{_libdir}/xulrunner-sdk-2/sdk
+GECKO_BIN_PATH=%{_libdir}/xulrunner-2
+GECKO_INCLUDE_PATH=%{_includedir}/xulrunner-sdk-2
 
 %ifarch x86_64 ppc64 ia64
 USE_64=1
@@ -144,6 +152,11 @@ cp %{SOURCE2} $RPM_BUILD_ROOT/%{autostartdir}
 cd %{_builddir}
 cp %{escname}/esc/LICENSE $RPM_BUILD_ROOT/%{docdir}
 
+rm -f $RPM_BUILD_ROOT/%{escdir}/esc
+
+echo "xulrunner ./application.ini \$* &" > $RPM_BUILD_ROOT/%{escdir}/esc
+
+chmod 755  $RPM_BUILD_ROOT/%{escdir}/esc
 chmod 755 -R $RPM_BUILD_ROOT/%{escdir}/chrome
 chmod 755 -R $RPM_BUILD_ROOT/%{escdir}/defaults
 chmod 755  $RPM_BUILD_ROOT/%{escdir}/application.ini
@@ -161,6 +174,7 @@ rm -rf $RPM_BUILD_ROOT
 %{escbindir}/esc
 %{escdir}/application.ini
 
+%{escdir}/chrome.manifest
 %{escdir}/chrome/chrome.manifest
 
 %{escdir}/chrome/content
@@ -195,9 +209,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 %changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
+* Tue Nov 19 2011   Jack Magne <jmagne at redhat.com>= 1.1.0-14
+- Related #688361 - Get ESC to run on Gecko 2.0.
 * Thu Apr 15 2010   Jack Magne <jmagne at redhat.com>= 1.1.0-11
 - Adjust for new linking rules.
 * Tue Sep 15 2009   Jack Magne <jmagne at redhat.com>= 1.1.0-10