X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=macros.pld.in;h=4e1f81b715ac79531ac452778daed79cfed0320d;hb=000793b8790f12d832e8032f19ff1ed3faaffc7b;hp=fc6d889d4885320406217ff3c74d464c9d0b061a;hpb=4ccaee6b1c10d89b0b2459d1de95a10295b41831;p=packages%2Frpm.git

diff --git a/macros.pld.in b/macros.pld.in
index fc6d889..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}\
@@ -109,7 +108,7 @@ 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
 
@@ -132,6 +131,12 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 %_files_listed_twice_terminate_build	1
 %_unpackaged_subdirs_terminate_build	0
 
+#
+# 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,7 +179,8 @@ 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
+# 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}
 
@@ -183,6 +189,9 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 %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}