X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=macros.pld.in;h=ffeec4dca00fe2beb8a82842826e2420a516e104;hb=9b8655c2440d92c0a0df2746fa5b052f45fa3bcb;hp=3cb7635b5dfe508e218c6d00034fe3c77b779917;hpb=048d06f838305ee8841eca3b553785d9fd8b399d;p=packages%2Frpm.git

diff --git a/macros.pld.in b/macros.pld.in
index 3cb7635..ffeec4d 100644
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -30,7 +30,6 @@
 %_sysconfdir		%{_prefix}/etc
 %_sharedstatedir	/var/lib
 %_localstatedir		/var
-%_lib			lib
 %_libdir		%{_exec_prefix}/%{_lib}
 %_includedir		%{_prefix}/include
 %_oldincludedir		/usr/include
@@ -47,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}\
@@ -95,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
@@ -112,11 +111,31 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 
 %_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
+# will generate R:/bin/prog and we don't want that as /bin/prog is optional in this case
+# 0 - Use external generator
+# 1 - Use internal generator if available
+# 2 - Use __scriptlet_requires to process scriptlet dependencies
+%_use_internal_dependency_generator	1
+
+%_duplicate_files_terminate_build	1
+%_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
 
@@ -160,15 +179,14 @@ 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
 %x8664 x86_64 amd64 ia32e
 %ppc   ppc ppc7400 ppc7450
 
-
 #---------------------------------------------------------------------
 #	Expanded at end of %prep
 #