[mozilla-noscript] change the macros to match MozillaExtensionsDraft

[tomspur]

commit 4e315f13b51dc6a961422ae8aa772b048b6e93d9
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Fri Aug 5 23:20:26 2011 +0200

    change the macros to match MozillaExtensionsDraft

 mozilla-noscript.spec |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 deletions(-)
---
diff --git a/mozilla-noscript.spec b/mozilla-noscript.spec
index 84d6487..2b16f68 100644
--- a/mozilla-noscript.spec
+++ b/mozilla-noscript.spec
@@ -1,11 +1,15 @@
-%global moz_extensions %{_datadir}/mozilla/extensions
+# internal macros ???
+%global _firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
+%global _seamonkey_app_id \{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 
-%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
-%global src_ext_id \{73a6fe31-595d-460b-a920-fcc0f8843232\}
-%global inst_dir %{moz_extensions}/%{firefox_app_id}/%{src_ext_id}
+# common macros, yet to be defined. see:
+# https://fedoraproject.org/wiki/User:Kalev/MozillaExtensionsDraft
+%global _moz_extensions %{_datadir}/mozilla/extensions
+%global _firefox_extdir %{_moz_extensions}/%{_firefox_app_id}
+%global _seamonkey_extdir %{_moz_extensions}/%{_seamonkey_app_id}
 
-%global seamonkey_app_id \{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
-%global sym_link_dir %{moz_extensions}/%{seamonkey_app_id}
+# needed for this package
+%global extension_id \{73a6fe31-595d-460b-a920-fcc0f8843232\}
 
 Name:           mozilla-noscript
 Version:        2.1.1
@@ -48,16 +52,18 @@ dos2unix NoScript_License.txt
 
 %install
 rm -rf %{buildroot}
-install -Dp -m 644 chrome.manifest %{buildroot}%{inst_dir}/chrome.manifest
-#install -Dp -m 644 install.js %{buildroot}%{inst_dir}/install.js
-install -Dp -m 644 install.rdf %{buildroot}%{inst_dir}/install.rdf
-install -Dp -m 644 components/noscriptService.js %{buildroot}%{inst_dir}/components/noscriptService.js
-install -Dp -m 644 defaults/preferences/noscript.js %{buildroot}%{inst_dir}/defaults/preferences/noscript.js
-install -Dp -m 644 chrome/noscript.jar %{buildroot}%{inst_dir}/chrome/noscript.jar
-
-# symlink from seamonkey extension to firefox extension
-mkdir -p %{buildroot}%{sym_link_dir}
-ln -s %{inst_dir} %{buildroot}%{sym_link_dir}
+# install into _firefox_extdir
+install -Dp -m 644 chrome.manifest %{buildroot}%{_firefox_extdir}/%{extension_id}/chrome.manifest
+#install -Dp -m 644 install.js %{buildroot}%{_firefox_extdir}/%{extension_id}/install.js
+install -Dp -m 644 install.rdf %{buildroot}%{_firefox_extdir}/%{extension_id}/install.rdf
+install -Dp -m 644 components/noscriptService.js %{buildroot}%{_firefox_extdir}/%{extension_id}/components/noscriptService.js
+install -Dp -m 644 defaults/preferences/noscript.js \
+    %{buildroot}%{_firefox_extdir}/%{extension_id}/defaults/preferences/noscript.js
+install -Dp -m 644 chrome/noscript.jar %{buildroot}%{_firefox_extdir}/%{extension_id}/chrome/noscript.jar
+
+# symlink from _seamonkey_extdir to _firefox_extdir
+mkdir -p %{buildroot}%{_seamonkey_extdir}
+ln -s %{_firefox_extdir}/%{extension_id}/ %{buildroot}%{_seamonkey_extdir}
 
 %clean
 rm -rf %{buildroot}
@@ -66,11 +72,14 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc GPL.txt NoScript_License.txt mozilla.cfg
-%{inst_dir}
-%{sym_link_dir}
+%{_seamonkey_extdir}/%{extension_id}/
+%{_firefox_extdir}/%{extension_id}/
 
 
 %changelog
+* Fri Aug  5 2011 Thomas Spura <tomspur at fedoraproject.org> - 2.1.1-2
+- change the macros to match MozillaExtensionsDraft
+
 * Fri Jun  3 2011 Thomas Spura <tomspur at fedoraproject.org> - 2.1.1-1
 - update to new version (#691356)
 - renew patch