X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=macros.pld.in;h=4e1f81b715ac79531ac452778daed79cfed0320d;hp=87e5df03673da2c2112a4dc71ea176f6fa97eb10;hb=035f105f81e23b8d9a1a0ec96f477a71c79ec0ef;hpb=cd0ffaa787f201eb21c7cfb19b10d3d8e62fd6fb

diff --git a/macros.pld.in b/macros.pld.in
index 87e5df0..4e1f81b 100644
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -25,7 +25,7 @@
 %_exec_prefix		%{_prefix}
 %_bindir		%{_exec_prefix}/bin
 %_sbindir		%{_exec_prefix}/sbin
-%_libexecdir		%{_exec_prefix}/%{_lib}
+%_libexecdir		%{_exec_prefix}/libexec
 %_datadir		%{_prefix}/share
 %_sysconfdir		%{_prefix}/etc
 %_sharedstatedir	/var/lib
@@ -46,13 +46,12 @@
 %__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_check_shebangs}\
 %{__spec_install_post_compress_docs}\
 %{__spec_install_post_py_hardlink}\
 %{__spec_install_post_perl_clean}\
@@ -94,6 +93,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 +108,16 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 %buildroot		%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 
 %_source_payload	w9.gzdio
-%_binary_payload	w9.lzdio
+%_binary_payload	w6.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,8 +131,11 @@ 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
+#
+# Export package NEVRA (stamped with install tid) info for HRMIB on this path.
+#
+# XXX	Note: escaped %% for use in headerSprintf()
+%_hrmib_path	/var/cache/hrmib/%{___NVRA}
 
 #-----------------------------------------------------------------
 # CFLAGS and LDFLAGS used to build
@@ -174,15 +179,19 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 # cf http://wiki.mandriva.com/en/Development/Packaging/Problems#format_not_a_string_literal_and_no_format_arguments
 %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}}
+# Use -Werror=trampolines to prevent GCC from generating code that require executable stack
+%_ssp_cflags		-fstack-protector-strong --param=ssp-buffer-size=4 -Werror=trampolines
+%__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
 %x8664 x86_64 amd64 ia32e
 %ppc   ppc ppc7400 ppc7450
 
+# avoid fdatasync syscall flood during database operations.
+%__nofsync	nofsync
+
 #---------------------------------------------------------------------
 #	Expanded at end of %prep
 #
@@ -195,6 +204,8 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 
 %__id		/bin/id
 
+#
+# DO NOT put anything after this %%{load:...} !
 #
 # rpm5 prolog for loading the standard macro
 %{load:/etc/rpm/macros.d/*.macros}