Author: glen Date: Wed Jan 10 01:57:00 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- allow to force arch for %browser_plugins_add_browser
---- Files affected:
SOURCES:
rpm.macros (1.363 -> 1.364)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.363 SOURCES/rpm.macros:1.364
--- SOURCES/rpm.macros:1.363 Wed Jan 10 02:21:53 2007
+++ SOURCES/rpm.macros Wed Jan 10 02:56:55 2007
@@ -1328,6 +1328,8 @@
#
# <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 @@
%_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}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.363&r2=1.364&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
