- drop obsolete files

[packages/rpm.git] / rpm-macros.patch

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 43d56e3f82d0c3852c6eeba92c4ed59b81952bb6..eb923fc75ed6f6f6f453054776ff680b0eb97ee6 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -46,15 +46,6 @@ diff -urN rpm.org/macros.in rpm/macros.in
  
  #     Archive formats to use for source/binary package payloads.
  #             "cpio"          cpio archive (default)
-@@ -522,7 +522,7 @@
- 
- #
- # Path to magic file used for file classification.
--%_rpmfc_magic_path    %{_rpmhome}/magic
-+%_rpmfc_magic_path    /usr/share/file/magic
- 
- #==============================================================================
- # ---- Database configuration macros.
 @@ -1224,17 +1224,17 @@
  %_exec_prefix         %{_prefix}
  %_bindir              %{_exec_prefix}/bin
@@ -83,8 +74,8 @@ diff -urN rpm.org/macros.in rpm/macros.in
  # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
  #%__executable_provides       %{_rpmhome}/executabledeps.sh --provides
  #%__executable_requires       %{_rpmhome}/executabledeps.sh --requires
--%__scriptlet_requires /bin/bash --rpm-requires
-+#%__scriptlet_requires        /bin/bash --rpm-requires
+-%__scriptlet_requires %{__bash} --rpm-requires
++#%__scriptlet_requires        %{__bash} --rpm-requires
  
 +# PLD rpm macros
 +%_enable_debug_packages 1