- killed warning in scripts-closefds patch

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index b801453ca9adedeb4f7deb9555885d12bf1415d5..5bca27c772164faae907651da20f26c5d3b4a09d 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 | /usr/lib64 | /lib | /lib64 | /usr/local/lib | /usr/local/lib64 | /usr/X11R6/lib | /usr/X11R6/lib64 ) \
                                echo "remove-rpath: $dir in $file"; \
                                ;; \
                        * ) \
@@ -334,10 +336,10 @@ echo "Compress kernel modules if any."; \
 # Requires/Provides automation
 # exceptions system by Jacek Konieczny <jajcus@pld.org.pl>
 #
-#%_noautoreqfiles      '%{_defaultdocdir}.*' '%{_examplesdir}.*'
+%_noautoreqfiles       %(sed -e s'/#.*//' /etc/rpm/noautoreqfiles)
+%_noautoprovfiles      %(sed -e s'/#.*//' /etc/rpm/noautoprovfiles)
 #%_noautoreq           %{nil}
-#%_noautoreqdep                %{nil}
-#%_noautoprovfiles     %{nil}
+%_noautoreqdep         %(sed -e s'/#.*//' /etc/rpm/noautoreqdep)
 #%_noautoprov          %{nil}
 #%_noautocompressdoc   %{nil}
 #