- cosmetics

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

diff --git a/macros.pld.in b/macros.pld.in
index 6d12784a9bc7bb186add2daf7285d8e1084e90a4..ffeec4dca00fe2beb8a82842826e2420a516e104 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
@@ -114,9 +114,9 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 # provides don't obsolete
 %_upgrade_tag          name
 
-# we use '@' in release for kernel packages
-%pattern_Release       ^[A-Za-z0-9+._@]+$
-
+# 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
@@ -130,6 +130,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
 
@@ -173,8 +179,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