- allow to force arch for %browser_plugins_add_browser

Changed files:
    rpm.macros -> 1.364

diff --git a/rpm.macros b/rpm.macros
index 14250a7e52d00b7d112cd7cfdc26edd14f7b38a9..21f3913200e13d5049fb654df90636a5af7fbe18 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1328,6 +1328,8 @@ done                                                                                                                              \
 #
 #  <name> (required) -- name of the browser. usually %{name}.
 #  -p <plugindir> (required) -- in what directory browser searches for its plugins.
+#  -b -- default blacklists
+#  -a <arch> override arch
 #
 # Example:
 #   %browser_plugins_add_browser %{name} -p %{_firefoxdir}/plugins
@@ -1336,10 +1338,11 @@ done                                                                                                                            \
 %_browserpluginsdir                    %{_libdir}/browser-plugins
 %update_browser_plugins                /usr/sbin/update-browser-plugins || :
 
-%browser_plugins_add_browser(p:b:) \
+%browser_plugins_add_browser(p:b:a:) \
+       browser=%1.%{!-a:%{_target_base_arch}}%{!-a*} \
        install -d $RPM_BUILD_ROOT%{_browserpluginsconfdir}/{blacklist,browsers}.d \
-       ln -s %{-p*} $RPM_BUILD_ROOT%{_browserpluginsconfdir}/browsers.d/%1.%{_target_base_arch} \
-       blacklist_file=$RPM_BUILD_ROOT%{_browserpluginsconfdir}/blacklist.d/%1.%{_target_base_arch}.blacklist \
+       ln -s %{-p*} $RPM_BUILD_ROOT%{_browserpluginsconfdir}/browsers.d/$browser \
+       blacklist_file=$RPM_BUILD_ROOT%{_browserpluginsconfdir}/blacklist.d/$browser.blacklist \
        echo '# This file format is shell globs at base dir of plugindir' > $blacklist_file \
        %{-b:cat >> $blacklist_file %{-b*}} \
 %{nil}