summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--enigmail-1.1.2-perm.patch19
-rw-r--r--thunderbird-enigmail.spec14
2 files changed, 31 insertions, 2 deletions
diff --git a/enigmail-1.1.2-perm.patch b/enigmail-1.1.2-perm.patch
new file mode 100644
index 0000000..476bed0
--- /dev/null
+++ b/enigmail-1.1.2-perm.patch
@@ -0,0 +1,19 @@
+diff -up enigmail-1.1.2/package/enigmail.js.perm enigmail-1.1.2/package/enigmail.js
+--- enigmail-1.1.2/package/enigmail.js.perm 2010-06-30 19:18:50.000000000 +0200
++++ enigmail-1.1.2/package/enigmail.js 2010-06-30 19:19:22.000000000 +0200
+@@ -1231,7 +1231,6 @@ function () {
+ .getInstallLocation(ENIGMAIL_EXTENSION_ID);
+ var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
+ extensionLoc.append("gpg-agent-wrapper.sh");
+- extensionLoc.permissions=0755;
+ agentProcess = Components.classes[NS_PROCESS_UTIL_CONTRACTID].createInstance(Components.interfaces.nsIProcess);
+ agentProcess.init(extensionLoc);
+ agentProcess.run(true, [ "stop", this.gpgAgentProcess ], 2);
+@@ -1758,7 +1757,6 @@ function (domWindow) {
+ .getInstallLocation(ENIGMAIL_EXTENSION_ID);
+ var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
+ extensionLoc.append("gpg-agent-wrapper.sh");
+- extensionLoc.permissions=0755;
+ args.unshift(command.path);
+ args.unshift("start");
+ command = extensionLoc;
diff --git a/thunderbird-enigmail.spec b/thunderbird-enigmail.spec
index 6f2ea24..cb2bfa2 100644
--- a/thunderbird-enigmail.spec
+++ b/thunderbird-enigmail.spec
@@ -28,11 +28,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.1.1
+Version: 1.1.2
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 2%{?dist}
+Release: 1%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -69,6 +69,10 @@ Patch2: thunderbird-shared-error.patch
# Fixes gcc complain that nsFrame::delete is protected
Patch4: xulrunner-1.9.2.1-build.patch
+# Enigmail patch
+Patch101: enigmail-1.1.2-perm.patch
+
+
%if %{official_branding}
# Required by Mozilla Corporation
@@ -227,6 +231,9 @@ done
popd
%else
tar xzf %{SOURCE100} -C mailnews/extensions
+pushd mailnews/extensions/enigmail
+%patch101 -p1
+popd
%endif
#===============================================================================
@@ -335,6 +342,9 @@ fi
#===============================================================================
%changelog
+* Wed Jun 30 2010 Remi Collet <rpms@famillecollet.com> 1.1.2-1
+- Enigmail 1.1.1 (against thunderbird 3.1)
+
* Sat Jun 26 2010 Remi Collet <rpms@famillecollet.com> 1.1.1-2
- new sources (only fix displayed version)