[packages/enigmail] - move thunderbird plugin to noarch - drop icedove - rel 3
baggins
baggins at pld-linux.org
Sun Sep 3 10:47:58 CEST 2017
commit 8de18756cffc2420111f8ccaae0eeb20723804dc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Sep 3 10:47:26 2017 +0200
- move thunderbird plugin to noarch
- drop icedove
- rel 3
enigmail.spec | 84 +++++++++++++++++++++--------------------------------------
1 file changed, 29 insertions(+), 55 deletions(-)
---
diff --git a/enigmail.spec b/enigmail.spec
index 9a2cfdf..5003f37 100644
--- a/enigmail.spec
+++ b/enigmail.spec
@@ -2,7 +2,6 @@
# Conditional build:
%bcond_without thunderbird # Mozilla Thunderbird addon
%bcond_with seamonkey # Mozilla SeaMonkey addon
-%bcond_with icedove # Icedove addon
%bcond_without iceape # Iceape addon
# aliases:
%bcond_with mozilla # build both Mozilla packages
@@ -13,14 +12,13 @@
%define with_seamonkey 1
%endif
%if %{without iceapps}
-%undefine with_icedove
%undefine with_iceape
%endif
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.9.5
-Release: 2
+Release: 3
Epoch: 1
License: MPL v1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications/Mail
@@ -35,7 +33,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
Enigmail is an extension to the Mozilla-based mail clients (like
-Mozilla Thunderbird, Mozilla Seamonkey, Icedove or Iceape) which
+Mozilla Thunderbird, Mozilla Seamonkey or Iceape) which
allows users to access the authentication and encryption features
provided by GnuPG.
@@ -49,7 +47,7 @@ Main Features:
%description -l pl.UTF-8
Enigmail to rozszerzenie klientów pocztowych opartych na Mozilli (jak
-Mozilla Thunderbird, Mozilla Seamonkey, Icedove i Iceape), pozwalające
+Mozilla Thunderbird, Mozilla Seamonkey i Iceape), pozwalające
użytkownikom na dostęp do uwierzytelniania i szyfrowania zapewnianego
przez GnuPG.
@@ -71,6 +69,7 @@ Requires: gnupg-agent >= 2.0.7
Requires: thunderbird >= 38.0
Obsoletes: icedove-addon-enigmail
Obsoletes: mozilla-thunderbird-addon-enigmail
+BuildArch: noarch
%description -n thunderbird-addon-enigmail
Enigmail is an extension to the Mozilla Thunderbird mail client of
@@ -134,42 +133,6 @@ Główne możliwości:
podpisywania dla każdego adresata
- interfejs do zarządzania kluczami OpenPGP
-%package -n icedove-addon-enigmail
-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: gnupg2 >= 2.0.7
-Requires: gnupg-agent >= 2.0.7
-Requires: icedove >= 38.0
-Obsoletes: mozilla-thunderbird-addon-enigmail
-
-%description -n icedove-addon-enigmail
-Enigmail is an extension to the Icedove mail client of which allows
-users to access the authentication and encryption features provided by
-GnuPG.
-
-Main Features:
-- Encrypt/sign mail when sending, decrypt/authenticate received mail
-- Support for inline-PGP (RFC 2440) and PGP/MIME (RFC 3156)
-- Per-Account based encryption and signing defaults
-- Per-Recipient rules for automated key selection, and
- enabling/disabling encryption and signing
-- OpenPGP key management interface
-
-%description -n icedove-addon-enigmail -l pl.UTF-8
-Enigmail to rozszerzenie klienta pocztowego Icedove, pozwalające
-użytkownikom na dostęp do uwierzytelniania i szyfrowania zapewnianego
-przez GnuPG.
-
-Główne możliwości:
-- szyfrowanie/podpisywanie poczty przy wysyłaniu,
- odszyfrowywanie/uwierzytelnianie poczty odebranej
-- obsługa inline-PGP (RFC 2440) i PGP/MIME (RFC 3156)
-- ustawienia domyślne szyfrowania i podpisywania dla każdego konta
-- reguły automatycznego wyboru kluczy i włączenia szyfrowania oraz
- podpisywania dla każdego adresata
-- interfejs do zarządzania kluczami OpenPGP
-
%package -n iceape-addon-enigmail
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
@@ -215,7 +178,7 @@ Główne możliwości:
%{__make} -j1
%install
-for prog in %{?with_thunderbird:thunderbird} %{?with_seamonkey:seamonkey} %{?with_icedove:icedove} %{?with_iceape:iceape} ; do
+for prog in %{?with_seamonkey:seamonkey} %{?with_iceape:iceape} ; do
ext_dir=$RPM_BUILD_ROOT%{_libdir}/$prog/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\}
install -d $ext_dir/{chrome,components,defaults/preferences,modules,wrappers}
cp -p build/dist/chrome/enigmail.jar $ext_dir/chrome
@@ -227,24 +190,35 @@ cp -p build/dist/chrome.manifest $ext_dir
cp -p build/dist/install.rdf $ext_dir
done
+for prog in %{?with_thunderbird:thunderbird} ; do
+ext_dir=$RPM_BUILD_ROOT%{_datadir}/$prog/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\}
+install -d $ext_dir/{chrome,components,defaults/preferences,modules,wrappers}
+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
+cp -p build/dist/wrappers/*.sh $ext_dir/wrappers
+cp -p build/dist/chrome.manifest $ext_dir
+cp -p build/dist/install.rdf $ext_dir
+done
+
%clean
rm -rf $RPM_BUILD_ROOT
%define genfiles()\
%files -n %{1}-addon-enigmail\
%defattr(644,root,root,755)\
-%dir %{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}\
-%{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome\
-%{_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}/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\
-%{_libdir}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf\
+%dir %{2}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}\
+%{2}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome\
+%{2}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components\
+%{2}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults\
+%{2}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules\
+%dir %{2}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers\
+%attr(755,root,root) %{2}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-agent-wrapper.sh\
+%{2}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest\
+%{2}/%{1}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf\
%{nil}
-%{?with_thunderbird:%{expand:%genfiles thunderbird}}
-%{?with_seamonkey:%{expand:%genfiles seamonkey}}
-%{?with_icedove:%{expand:%genfiles icedove}}
-%{?with_iceape:%{expand:%genfiles iceape}}
+%{?with_thunderbird:%{expand:%genfiles thunderbird %{_datadir}}}
+%{?with_seamonkey:%{expand:%genfiles seamonkey %{_libdir}}}
+%{?with_iceape:%{expand:%genfiles iceape %{_libdir}}}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/enigmail.git/commitdiff/8de18756cffc2420111f8ccaae0eeb20723804dc
More information about the pld-cvs-commit
mailing list