- include --x-libraries=/usr/X11R6/%{_lib} in %configure macros

- remove RPATH in all lib* directories

Changed files:
    rpm.macros -> 1.136

diff --git a/rpm.macros b/rpm.macros
index b801453ca9adedeb4f7deb9555885d12bf1415d5..dc31b0238214b888eae0e7b7937898062dcd576f 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -66,6 +66,7 @@
        --sharedstatedir=%{_sharedstatedir} \
        --mandir=%{_mandir} \
        --infodir=%{_infodir} \
+       --x-libraries=/usr/X11R6/%{_lib} \
 }
 
 #----------------------------------------------------------------
@@ -91,6 +92,7 @@
        --sharedstatedir=%{_sharedstatedir} \
        --mandir=%{_mandir} \
        --infodir=%{_infodir} \
+       --x-libraries=/usr/X11R6/%{_lib} \
 }
 
 # ------------------------------------------------------------------------
@@ -278,7 +280,7 @@ while read file ; do \
        for dir in `chrpath -l "$file" | \
                    awk '/RPATH=/ { gsub(/.*RPATH=/,""); gsub(/:/," "); print $0 }'` ; do \
                        case $dir in \
-                       /home/* | /tmp/* | /usr/lib | /lib | /usr/local/lib | /usr/X11R6/lib ) \
+                       /home/* | /tmp/* | /usr/lib* | /lib* | /usr/local/lib* | /usr/X11R6/lib* ) \
                                echo "remove-rpath: $dir in $file"; \
                                ;; \
                        * ) \