- updated

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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index a07d1f286df347699eaecdb27b2ba80c76763aee..19be654365841afa05da108ac161b21c56ae8ae4 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,6 +1,6 @@
 --- rpm-4.4.8/macros.in.orig   2007-04-08 20:24:47.206783474 +0200
 +++ rpm-4.4.8/macros.in        2007-04-08 20:36:08.925632417 +0200
-@@ -206,7 +206,7 @@
+@@ -208,7 +208,7 @@
  %endif\
  %{nil}
  
@@ -9,7 +9,7 @@
  
  #     The path to the pgp executable (legacy, use %{__pgp} instead).
  %_pgpbin              %{__pgp}
-@@ -233,12 +233,12 @@
+@@ -237,12 +237,12 @@
  #     The directory where newly built source packages will be written.
  %_srcrpmdir           %{_topdir}/SRPMS
  
@@ -20,12 +20,12 @@
  %tmpdir                       %{_tmppath}
  
  #     Path to top of build area.
--%_topdir              %{_usrsrc}/rpm
+-%_topdir              @PKGSRCDIR_MACRO@
 +%_topdir              %(echo $HOME)/rpm
  
  #==============================================================================
  # ---- Optional rpmrc macros.
-@@ -248,7 +248,7 @@
+@@ -252,7 +252,7 @@
  #     Configurable build root path, same as BuildRoot: in a specfile.
  #     (Note: the configured macro value will override the spec file value).
  #
@@ -34,7 +34,7 @@
  
  #     The sub-directory (relative to %{_builddir}) where sources are compiled.
  #     This macro is set after processing %setup, either explicitly from the
-@@ -347,8 +347,8 @@
+@@ -351,8 +351,8 @@
  #             "w9.bzdio"      bzip2 level 9.
  #             "w9.lzdio"      lzma level 9.
  #
@@ -45,16 +45,16 @@
  
  #     Archive formats to use for source/binary package payloads.
  #             "cpio"          cpio archive (default)
-@@ -498,7 +498,7 @@
+@@ -517,7 +517,7 @@
  
  #
  # Path to magic file used for file classification.
--%_rpmfc_magic_path    %{_usr}/lib/rpm/magic
+-%_rpmfc_magic_path    %{_rpmhome}/magic
 +%_rpmfc_magic_path    /usr/share/file/magic
  
  #==============================================================================
  # ---- Database configuration macros.
-@@ -1127,17 +1127,17 @@
+@@ -1219,17 +1219,17 @@
  %_exec_prefix         %{_prefix}
  %_bindir              %{_exec_prefix}/bin
  %_sbindir             %{_exec_prefix}/sbin
@@ -78,16 +78,19 @@
  %_localedir           %{_datadir}/locale
  
  #==============================================================================
-@@ -1428,7 +1428,25 @@
- # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
- #%__executable_provides       %{_usrlibrpm}/executabledeps.sh --provides
- #%__executable_requires       %{_usrlibrpm}/executabledeps.sh --requires
+@@ -1530,7 +1530,28 @@
+ # 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
  
 +# PLD rpm macros
 +%_enable_debug_packages 1
 +
++# provides don't obsolete
++%_upgrade_tag name
++
 +#-----------------------------------------------------------------
 +# CFLAGS and LDFLAGS used to build
 +