From 02ebf70faf7e5b7372df20a9df87e3b5fee22ca4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 10 Jan 2007 01:56:55 +0000 Subject: [PATCH] - allow to force arch for %browser_plugins_add_browser Changed files: rpm.macros -> 1.364 --- rpm.macros | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rpm.macros b/rpm.macros index 14250a7..21f3913 100644 --- a/rpm.macros +++ b/rpm.macros @@ -1328,6 +1328,8 @@ done \ # # (required) -- name of the browser. usually %{name}. # -p (required) -- in what directory browser searches for its plugins. +# -b -- default blacklists +# -a 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} -- 2.44.0