[esc/f15] Resolves #688361 - Fix additinal ESC Gecko issues.

[Jack Magne]

commit 5043e199ed2535a9fc2c413df63cca96f828978c
Author: Jack Magne <jmagne at localhost.localdomain>
Date:   Fri Sep 16 10:15:07 2011 -0700

    Resolves #688361 - Fix additinal ESC Gecko issues.

 esc-1.1.0-fix11.patch |   72 +++++++++++++++++++++++++++++++++++++++++++++++++
 esc.spec              |   11 +++++++-
 2 files changed, 82 insertions(+), 1 deletions(-)
---
diff --git a/esc-1.1.0-fix11.patch b/esc-1.1.0-fix11.patch
new file mode 100755
index 0000000..5ecf83e
--- /dev/null
+++ b/esc-1.1.0-fix11.patch
@@ -0,0 +1,72 @@
+diff -up ./esc/src/app/xpcom/Makefile.sdk.fix11 ./esc/src/app/xpcom/Makefile.sdk
+--- ./esc/src/app/xpcom/Makefile.sdk.fix11	2011-09-16 09:43:28.473284954 -0700
++++ ./esc/src/app/xpcom/Makefile.sdk	2011-09-16 09:43:43.701284958 -0700
+@@ -129,6 +129,10 @@ ifdef ESC_VERSION
+ GECKO_DEFINES += -DESC_VERSION=$(ESC_VERSION)
+ endif
+ 
++ifdef GECKO_BIN_PATH
++GECKO_DEFINES += -DGECKO_BIN_PATH=$(GECKO_BIN_PATH)
++endif
++
+ NSS_INCLUDE =  /usr/include/nss3
+ NSPR_INCLUDE =  /usr/include/nspr4
+ 
+diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix11 ./esc/src/app/xpcom/rhCoolKey.cpp
+--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix11	2011-09-16 09:05:12.564284553 -0700
++++ ./esc/src/app/xpcom/rhCoolKey.cpp	2011-09-16 09:05:23.507284562 -0700
+@@ -538,7 +538,7 @@ PRBool rhCoolKey::InitInstance()
+ 
+     char xpcom_path[4096];
+     xpcom_path[0] = 0;
+-
++/*
+     static const GREVersionRange greVersion = 
+     {
+     "1.9", PR_TRUE,
+@@ -550,6 +550,13 @@ PRBool rhCoolKey::InitInstance()
+         return PR_FALSE;
+     }
+ 
++*/
++
++    char *grePath = (char *) GETSTRING(GECKO_BIN_PATH);
++
++    
++    snprintf(xpcom_path,4096,grePath);
++
+     char *lib_name =(char *) XPCOM_LIB_NAME ;
+ 
+   
+diff -up ./esc/src/app/xul/esc/application.ini.fix11 ./esc/src/app/xul/esc/application.ini
+--- ./esc/src/app/xul/esc/application.ini.fix11	2011-09-16 09:44:03.935284960 -0700
++++ ./esc/src/app/xul/esc/application.ini	2011-09-16 09:47:31.836285002 -0700
+@@ -25,11 +25,11 @@ Vendor=RedHat
+ Name=ESC
+ ;
+ ; This field specifies your application's version.  This field is optional.
+-Version=1.1.0-15
++Version=1.1.0-16
+ ;
+ ; This field specifies your application's build ID (timestamp).  This field is
+ ; required.
+-BuildID=0000001015
++BuildID=0000001016
+ ;
+ ; This ID is just an example.  Every XUL app ought to have it's own unique ID.
+ ; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
+@@ -41,12 +41,12 @@ ID={6380471b-1924-4b48-b652-49f42951af86
+ ; This field is required.  It specifies the minimum Gecko version that this
+ ; application requires.  Specifying 1.8 matches all releases with a version
+ ; prefixed by 1.8 (e.g., 1.8a4, 1.8b, 1.8.2).
+-MinVersion=1.99
++MinVersion=6.0.0
+ ;
+ ; This field is optional.  It specifies the maximum Gecko version that this
+ ; application requires.  It should be specified if your application uses
+ ; unfrozen interfaces.  Specifying 1.8 matches all releases with a version
+ ; prefixed by 1.8 (e.g., 1.8a4, 1.8b, 1.8.2).
+-MaxVersion=2.99
++MaxVersion=20.0.0
+ 
+ [Shell]
diff --git a/esc.spec b/esc.spec
index f823e5c..d95e529 100644
--- a/esc.spec
+++ b/esc.spec
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.1.0
-Release: 15%{?dist} 
+Release: 16%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -18,6 +18,7 @@ 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
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -82,6 +83,7 @@ cryptographic smartcards.
 %patch8 -p1 -b .fix8
 %patch9 -p1 -b .fix9
 %patch10 -p1 -b .fix10
+%patch11 -p1 -b .fix11
 
 %build
 
@@ -148,6 +150,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
@@ -200,6 +207,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 %changelog
+* Fri Sep 16 2011   Jack Magne <jmagne at redhat.com>= 1.1.0-16
+- Resolves #688361 - Fix additinal ESC Gecko issues.
 * Tue Jul 19 2011   Jack Magne <jmagne at redhat.com>= 1.1.0-15
 - Resolves #688361 - Fix additional ESC Gecko 2.0 issue.
 * Thu Mar 24 2011   Jack Magne <jmagne at redhat.com>= 1.1.0-14