SOURCES (AC-branch): rpm.macros, rpm.macros - add -f (force) flag ...

[glen]

Author: glen                         Date: Tue Sep  6 17:43:46 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- add -f (force) flag for nsplugin_install for migration triggers

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.57 -> 1.158.4.58) 
SOURCES:
   rpm.macros (1.235 -> 1.236) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.57 SOURCES/rpm.macros:1.158.4.58
--- SOURCES/rpm.macros:1.158.4.57	Fri Sep  2 12:31:32 2005
+++ SOURCES/rpm.macros	Tue Sep  6 19:43:40 2005
@@ -719,9 +719,9 @@
 
 # see browser-plugins.spec / template-browser-plugin.spec
 # written by glen at pld-linux.org.
-%nsplugin_install(d:) { \
+%nsplugin_install(d:f) { \
 # create link if it's first install of either of the packages \
-if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{-d*} ]; then \
+if [ -n "%{-f:1}" ] || ([ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{-d*} ]); then \
 ( \
 %( \
 	for file in %{*}; do \

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.235 SOURCES/rpm.macros:1.236
--- SOURCES/rpm.macros:1.235	Tue Aug 23 20:44:00 2005
+++ SOURCES/rpm.macros	Tue Sep  6 19:43:41 2005
@@ -720,9 +720,9 @@
 
 # see browser-plugins.spec / template-browser-plugin.spec
 # written by glen at pld-linux.org.
-%nsplugin_install(d:) { \
+%nsplugin_install(d:f) { \
 # create link if it's first install of either of the packages \
-if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{-d*} ]; then \
+if [ -n "%{-f:1}" ] || ([ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{-d*} ]); then \
 ( \
 %( \
 	for file in %{*}; do \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.57&r2=1.158.4.58&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.235&r2=1.236&f=u