commit a1115d2a916f11e322ff22b264f4b27e1f73de27
Author: Elan Ruusamäe <[email protected]>
Date: Sat Jan 23 01:27:13 2016 +0200
setup trigger for iceweasel, more macros fun
tested with iceweasel-42.0-1.x86_64
mozilla-addon-gnome-keyring.spec | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/mozilla-addon-gnome-keyring.spec b/mozilla-addon-gnome-keyring.spec
index 96bd7b7..f586cdd 100644
--- a/mozilla-addon-gnome-keyring.spec
+++ b/mozilla-addon-gnome-keyring.spec
@@ -1,5 +1,3 @@
-# TODO
-# - setup symlink for firefox in post script
Summary: Extension that enables Gnome Keyring integration
Name: mozilla-addon-gnome-keyring
Version: 0.10
@@ -20,12 +18,13 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _enable_debug_packages 0
# this comes from install.rdf
-%define extension_ffox_id
\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
-%define extension_tbird_id
\{3550f703-e582-4d05-9a08-453d09bdfdc6\}
%define extension_id
[email protected]
%define extensionsdir /usr/lib/mozilla/extensions
+%define iceweasel_dir %{_datadir}/iceweasel/browser/extensions
+%define icedove_dir %{_libdir}/icedove/extensions
+
%description
This extension replaces the default password manager in both Firefox
and Thunderbird with an implementation which stores the passwords in
@@ -50,16 +49,25 @@ unzip bin/*.xpi -d
$RPM_BUILD_ROOT%{extensionsdir}/%{extension_id}
rm -rf $RPM_BUILD_ROOT
%triggerpostun -- %{name} < 0.10-4
-rm -f %{_libdir}/icedove/extensions/"{6f9d85e0-794d-11dd-ad8b-0800200c9a66}"
-rm -f %{_libdir}/icedove/extensions/"{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+rm -f %{icedove_dir}/"{6f9d85e0-794d-11dd-ad8b-0800200c9a66}"
+rm -f %{icedove_dir}/"{3550f703-e582-4d05-9a08-453d09bdfdc6}"
%triggerin -- icedove
-test -L %{_libdir}/icedove/extensions/%{extension_id} || \
- ln -sf %{extensionsdir}/%{extension_id}
%{_libdir}/icedove/extensions/%{extension_id}
+test -L %{icedove_dir}/%{extension_id} || \
+ ln -sf %{extensionsdir}/%{extension_id} %{icedove_dir}/%{extension_id}
+
+%triggerun -- icedove
+if [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L %{icedove_dir}/%{extension_id} ];
then
+ rm -f %{icedove_dir}/%{extension_id}
+fi
+
+%triggerin -- iceweasel
+test -L %{iceweasel_dir}/%{extension_id} || \
+ ln -sf %{extensionsdir}/%{extension_id} %{iceweasel_dir}/%{extension_id}
%triggerun -- icedove
-if [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L
%{_libdir}/icedove/extensions/%{extension_id} ]; then
- rm -f %{_libdir}/icedove/extensions/%{extension_id}
+if [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L %{iceweasel_dir}/%{extension_id}
]; then
+ rm -f %{iceweasel_dir}/%{extension_id}
fi
%files
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mozilla-addon-gnome-keyring.git/commitdiff/a1115d2a916f11e322ff22b264f4b27e1f73de27
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
