Author: glen Date: Tue Aug 23 18:44:05 2005 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- %nsplugin_install fix: check for target dir existence, if installing on alien
base arch (i686 package on amd64) as the dependencies are basename based
---- Files affected:
SOURCES:
rpm.macros (1.158.4.55 -> 1.158.4.56)
SOURCES:
rpm.macros (1.234 -> 1.235)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.55 SOURCES/rpm.macros:1.158.4.56
--- SOURCES/rpm.macros:1.158.4.55 Tue Aug 23 20:32:05 2005
+++ SOURCES/rpm.macros Tue Aug 23 20:44:00 2005
@@ -719,7 +719,7 @@
# written by [EMAIL PROTECTED]
%nsplugin_install(d:) { \
# create link if it's first install of either of the packages \
-if [ "$1" = "1" ] && [ "$2" = "1" ]; then \
+if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{-d*} ]; then \
( \
%( \
for file in %{*}; do \
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.234 SOURCES/rpm.macros:1.235
--- SOURCES/rpm.macros:1.234 Tue Aug 23 20:32:05 2005
+++ SOURCES/rpm.macros Tue Aug 23 20:44:00 2005
@@ -722,7 +722,7 @@
# written by [EMAIL PROTECTED]
%nsplugin_install(d:) { \
# create link if it's first install of either of the packages \
-if [ "$1" = "1" ] && [ "$2" = "1" ]; then \
+if [ "$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.55&r2=1.158.4.56&f=u
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.234&r2=1.235&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
