- build with internal lua and enable extra lua libs, fixes

[packages/rpm.git] / macros.pld.in

diff --git a/macros.pld.in b/macros.pld.in
index 13a5819cdb58da77622df795c58592e0cac1e281..60c73f1541b88104c83633825d3551e6869ad914 100644 (file)
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -46,12 +46,10 @@
 %__compress_doc                @prefix@/lib/rpm/compress-doc%{?_noautocompressdoc: --noautocompressdoc='%{_noautocompressdoc}'}
 
 %__os_install_post \
-%{?ifnarch noarch:\
 %{__spec_install_post_strip}\
 %{__spec_install_post_chrpath}\
 %{__spec_install_post_compress_modules}\
 %{__spec_install_post_check_so}\
-%endif}\
 %{__spec_install_post_check_tmpfiles}\
 %{__spec_install_post_compress_docs}\
 %{__spec_install_post_py_hardlink}\
@@ -94,6 +92,8 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 #---------------------------------------------------------------------
 # Overwrite RPM macros with PLD specific one here.
 
+%__cp                  /bin/cp
+%__find                        /usr/bin/find
 %__grep                        /bin/grep
 %__lua                 %{_bindir}/lua
 %__rc                  %{_bindir}/rc
@@ -107,15 +107,16 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 %buildroot             %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 
 %_source_payload       w9.gzdio
-%_binary_payload       w9.xzdio
+%_binary_payload       w9.lzdio
 
 %_rpmfc_magic_path     /usr/share/file/magic
 
-%undefine              __scriptlet_requires
-
 # provides don't obsolete
 %_upgrade_tag          name
 
+# Disable automatic dependencies on symlinks for now (debuginfo packages pull too many deps)
+%_check_symlink_deps    0 
+ 
 # Do not generate executable() dependencies for scriptlets,
 # as it may give false positives, for example:
 # [ ! -x /bin/prog ] || /bin/prog
@@ -129,9 +130,6 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 %_files_listed_twice_terminate_build   1
 %_unpackaged_subdirs_terminate_build   0
 
-# activate filetriggers (cf http://wiki.mandriva.com/en/Rpm_filetriggers)
-%_filetriggers_dir /var/lib/rpm/filetriggers
-
 #-----------------------------------------------------------------
 # CFLAGS and LDFLAGS used to build
 
@@ -175,8 +173,8 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 %Werror_cflags         -Wformat -Werror=format-security
 
 %_ssp_cflags           -fstack-protector --param=ssp-buffer-size=4
-%__common_cflags       -O2 -fwrapv %{debuginfocflags} -pipe %{Werror_cflags} %{?_fortify_cflags}
-%__common_cflags_with_ssp      %{__common_cflags} %{?_ssp_cflags} %{!?nospecflags:%{?specflags}}
+%__common_cflags       -O2 -fwrapv -pipe %{Werror_cflags} %{debuginfocflags} %{?_fortify_cflags} %{!?nospecflags:%{?specflags}}
+%__common_cflags_with_ssp      %{__common_cflags} %{?_ssp_cflags}
 
 # arch macros
 %ix86  i386 i486 i586 i686 pentium3 pentium4 athlon