- Cosmetics Wars part 3 - "The Changelog Massacre"

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 14d045ae2576e8814a20b0cb15784f895ccb69fa..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} \
 }
 
 # ------------------------------------------------------------------------
@@ -143,7 +145,7 @@
 %_omf_dest_dir %(scrollkeeper-config --omfdir)
 
 # Location of pkgconfig files
-%_pkgconfigdir /usr/lib/pkgconfig
+%_pkgconfigdir /usr/%{_lib}/pkgconfig
 
 # Location of top applink dir
 %_applnkdir    /usr/X11R6/share/applnk
@@ -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}
 #
@@ -367,7 +369,7 @@ echo "Compress kernel modules if any."; \
 
 # directories
 %py_prefix      %(echo `python -c "import sys; print sys.prefix"`)
-%py_libdir      %{py_prefix}/lib/python%{py_ver}
+%py_libdir      %{py_prefix}/%{_lib}/python%{py_ver}
 %py_incdir      /usr/include/python%{py_ver}
 %py_sitedir     %{py_libdir}/site-packages
 %py_dyndir      %{py_libdir}/lib-dynload