[esc/f15] Address #688361, further fix for Gecko 2.0.

Jack Magne jmagne at fedoraproject.org
Tue Jul 19 18:30:56 UTC 2011


commit 799b46a9713bc7685373b682a51a9a03433ee318
Author: Jack Magne <jmagne at localhost.localdomain>
Date:   Tue Jul 19 04:09:57 2011 -0700

    Address #688361, further fix for Gecko 2.0.

 esc-1.1.0-fix10.patch |   29 +++++++++++++++++++++++++++++
 esc.spec              |    6 +++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/esc-1.1.0-fix10.patch b/esc-1.1.0-fix10.patch
new file mode 100644
index 0000000..f6eda05
--- /dev/null
+++ b/esc-1.1.0-fix10.patch
@@ -0,0 +1,29 @@
+diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix10 ./esc/src/app/xpcom/rhCoolKey.cpp
+--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix10	2011-07-19 03:47:15.264254844 -0700
++++ ./esc/src/app/xpcom/rhCoolKey.cpp	2011-07-19 03:47:30.224254842 -0700
+@@ -542,7 +542,7 @@ PRBool rhCoolKey::InitInstance()
+     static const GREVersionRange greVersion = 
+     {
+     "1.9", PR_TRUE,
+-    "2", PR_TRUE
++    "9.9", PR_TRUE
+     };
+ 
+     nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcom_path, 4096);
+diff -up ./esc/src/app/xul/esc/application.ini.fix10 ./esc/src/app/xul/esc/application.ini
+--- ./esc/src/app/xul/esc/application.ini.fix10	2011-07-19 03:42:23.368254822 -0700
++++ ./esc/src/app/xul/esc/application.ini	2011-07-19 03:42:40.531254827 -0700
+@@ -25,11 +25,11 @@ Vendor=RedHat
+ Name=ESC
+ ;
+ ; This field specifies your application's version.  This field is optional.
+-Version=1.1.0-13
++Version=1.1.0-15
+ ;
+ ; This field specifies your application's build ID (timestamp).  This field is
+ ; required.
+-BuildID=0000001013
++BuildID=0000001015
+ ;
+ ; 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
diff --git a/esc.spec b/esc.spec
index ee40cad..f823e5c 100644
--- a/esc.spec
+++ b/esc.spec
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.1.0
-Release: 14%{?dist} 
+Release: 15%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -17,6 +17,7 @@ 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
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -80,6 +81,7 @@ cryptographic smartcards.
 %patch7 -p1 -b .fix7
 %patch8 -p1 -b .fix8
 %patch9 -p1 -b .fix9
+%patch10 -p1 -b .fix10
 
 %build
 
@@ -198,6 +200,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 %changelog
+* 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
 - Resolves: #688361 - Get ESC to run on Gecko 2.0
 * Thu Apr 15 2010   Jack Magne <jmagne at redhat.com>= 1.1.0-11


More information about the scm-commits mailing list