- updated to 1.9.5 (for thunderbird 38+/seamonkey 2.35+; requires gnupg2)

diff --git a/enigmail.spec b/enigmail.spec
index 2342b7e5ee200d141a0e4d94a93e7e3d8934ef62..2e618b60a20c5dafc07a3ac1ec93033389bcbcb6 100644 (file)
--- a/enigmail.spec
+++ b/enigmail.spec
@@ -19,13 +19,13 @@
 Summary:       Mozilla mail clients extension for the GnuPG authentication and encryption features
 Summary(pl.UTF-8):     Rozszerzenie klientów pocztowych Mozilla do uwierzytelniania i szyfrowania w oparciu o GnuPG
 Name:          enigmail
-Version:       1.7.2
+Version:       1.9.5
 Release:       1
 Epoch:         1
 License:       MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:         X11/Applications/Mail
 Source0:       http://www.mozilla-enigmail.org/download/source/%{name}-%{version}.tar.gz
-# Source0-md5: d506093139dbeed51c70f00dfe308bc2
+# Source0-md5: 15eca51a6e7b3ff62b76e2dbea716305
 URL:           http://www.mozilla-enigmail.org/
 BuildRequires: make >= 3.81
 BuildRequires: perl-base >= 5
@@ -66,8 +66,9 @@ Główne możliwości:
 Summary:       Thunderbird extension for the authentication and encryption features provided by GnuPG
 Summary(pl.UTF-8):     Rozszerzenie Thunderbirda do uwierzytelniania i szyfrowania zapewnianego przez GnuPG
 Group:         X11/Applications/Mail
-Requires:      gnupg
-Requires:      mozilla-thunderbird >= 24
+Requires:      gnupg2 >= 2.0.7
+Requires:      gnupg-agent >= 2.0.7
+Requires:      mozilla-thunderbird >= 38.0
 
 %description -n mozilla-thunderbird-addon-enigmail
 Enigmail is an extension to the Mozilla Thunderbird mail client of
@@ -100,8 +101,9 @@ Główne możliwości:
 Summary:       SeaMonkey extension for the authentication and encryption features provided by GnuPG
 Summary(pl.UTF-8):     Rozszerzenie SeaMonkeya do uwierzytelniania i szyfrowania zapewnianego przez GnuPG
 Group:         X11/Applications/Mail
-Requires:      gnupg
-Requires:      seamonkey >= 2.26
+Requires:      gnupg2 >= 2.0.7
+Requires:      gnupg-agent >= 2.0.7
+Requires:      seamonkey >= 2.35
 
 %description -n seamonkey-addon-enigmail
 Enigmail is an extension to the mail client of Mozilla SeaMonkey which
@@ -134,8 +136,9 @@ Główne możliwości:
 Summary:       Icedove extension for the authentication and encryption features provided by GnuPG
 Summary(pl.UTF-8):     Rozszerzenie Icedove'a do uwierzytelniania i szyfrowania zapewnianego przez GnuPG
 Group:         X11/Applications/Mail
-Requires:      gnupg
-Requires:      icedove >= 24
+Requires:      gnupg2 >= 2.0.7
+Requires:      gnupg-agent >= 2.0.7
+Requires:      icedove >= 38.0
 Obsoletes:     mozilla-thunderbird-addon-enigmail
 
 %description -n icedove-addon-enigmail
@@ -169,8 +172,9 @@ Główne możliwości:
 Summary:       Iceape extension for the authentication and encryption features provided by GnuPG
 Summary(pl.UTF-8):     Rozszerzenie Iceape'a do uwierzytelniania i szyfrowania zapewnianego przez GnuPG
 Group:         X11/Applications/Mail
-Requires:      gnupg
-Requires:      iceape >= 2.26
+Requires:      gnupg2 >= 2.0.7
+Requires:      gnupg-agent >= 2.0.7
+Requires:      iceape >= 2.35
 Obsoletes:     seamonkey-addon-enigmail
 
 %description -n iceape-addon-enigmail
@@ -216,11 +220,9 @@ cp -p build/dist/chrome/enigmail.jar $ext_dir/chrome
 cp -p build/dist/components/*.{js,xpt} $ext_dir/components
 cp -p build/dist/defaults/preferences/enigmail.js $ext_dir/defaults/preferences
 cp -p build/dist/modules/*.js* $ext_dir/modules
-# ELF inside
-cp -a build/dist/platform $ext_dir/platform
 cp -p build/dist/wrappers/*.sh $ext_dir/wrappers
-cp -p build/dist/install.rdf $ext_dir
 cp -p build/dist/chrome.manifest $ext_dir
+cp -p build/dist/install.rdf $ext_dir
 done
 
 %clean
@@ -234,10 +236,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components\
 %{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults\
 %{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules\
-%dir %{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform\
-%dir %{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/Linux_*-gcc3\
-%dir %{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/Linux_*-gcc3/lib\
-%attr(755,root,root) %{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/Linux_*-gcc3/lib/libsubprocess-*-gcc3.so\
 %dir %{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers\
 %attr(755,root,root) %{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-agent-wrapper.sh\
 %{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest\