- enabled chrpath on alpha (current version works with Elf64)

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 5bca27c772164faae907651da20f26c5d3b4a09d..da42ecd01a9751a369e008566feaa2698102b516 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -271,7 +271,6 @@ echo "Compress man and info pages."; \
 %{!?no_install_post_chrpath: \
        %{?verbose:set -x;} \
 echo "Remove RPATH from executable binaries and shared object files."; \
-if [ "$(uname -m)" != alpha ] ; then \
 find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" | xargs -r file | \
        awk '/ELF.*(executable|shared object)/ {print $1}' | cut -d: -f1 | \
 while read file ; do \
@@ -291,7 +290,7 @@ while read file ; do \
        done ; \
        if [ "$rpath" = "" ] ; then chrpath -d "$file" > /dev/null ; \
        else chrpath -r "$rpath" "$file" > /dev/null ; fi ; \
-done; fi; } \
+done; } \
 } }
 #-----------------------------------------------------------------
 # Find and gzip all kernel modules
@@ -338,9 +337,9 @@ echo "Compress kernel modules if any."; \
 #
 %_noautoreqfiles       %(sed -e s'/#.*//' /etc/rpm/noautoreqfiles)
 %_noautoprovfiles      %(sed -e s'/#.*//' /etc/rpm/noautoprovfiles)
-#%_noautoreq           %{nil}
+%_noautoreq            %(sed -e s'/#.*//' /etc/rpm/noautoreq)
 %_noautoreqdep         %(sed -e s'/#.*//' /etc/rpm/noautoreqdep)
-#%_noautoprov          %{nil}
+%_noautoprov           %(sed -e s'/#.*//' /etc/rpm/noautoprov)
 #%_noautocompressdoc   %{nil}
 #
 %_missing_doc_files_terminate_build    1%{nil}
@@ -350,8 +349,10 @@ echo "Compress kernel modules if any."; \
 %_emacs_lispdir %(emacs %___emacs_lispdir_helper)
 %_xemacs_lispdir %(xemacs %___emacs_lispdir_helper)
 
-%__php_provides        @RPMCONFIGDIR@/php.prov
-%__php_requires @RPMCONFIGDIR@/php.req
+%__php_provides        %{nil}
+%__php_requires %{nil}
+%__perl_provides %{nil}
+%__perl_requires %{nil}
 
 # Perl specific macro definitions.
 %perl_privlib  %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib)
@@ -370,8 +371,10 @@ 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_scriptdir  %{py_prefix}/share/python%{py_ver}
 %py_incdir      /usr/include/python%{py_ver}
-%py_sitedir     %{py_libdir}/site-packages
+%py_sitedir    %{py_libdir}/site-packages
+%py_sitescriptdir %{py_scriptdir}/site-packages
 %py_dyndir      %{py_libdir}/lib-dynload
 
 # pure python modules compilation