- tmpdir moved to main macros; sane buildroot by default

Changed files:
    rpm-macros.patch -> 1.33
    rpm.macros -> 1.362

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 2f96d3077116a0e384b76c8478f6f64eedf21624..495206302e777708b650870382acddfa9ae5a948 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,8 +1,13 @@
-diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
---- rpm-4.4.6.orig/macros.in   2006-08-05 20:52:48.000000000 +0200
-+++ rpm-4.4.6.macros/macros.in 2006-08-05 20:53:57.000000000 +0200
-@@ -219,7 +219,7 @@
- %_tmppath             %{_var}/tmp
+diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
+--- rpm-4.4.7.org/macros.in    2007-01-06 18:28:22.094067000 +0100
++++ rpm-4.4.7/macros.in        2007-01-06 18:37:05.250762500 +0100
+@@ -217,10 +217,11 @@
+ %_srcrpmdir           %{_topdir}/SRPMS
+ 
+ #     Directory where temporaray files can be created.
+-%_tmppath             %{_var}/tmp
++%_tmppath             %(echo "${TMPDIR:-/tmp}")
++%tmpdir                       %{_tmppath}
  
  #     Path to top of build area.
 -%_topdir              %{_usrsrc}/rpm
@@ -10,7 +15,16 @@ diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
  
  #     The path to the unzip executable (legacy, use %{__unzip} instead).
  %_unzipbin            %{__unzip}
-@@ -330,8 +330,8 @@
+@@ -233,7 +234,7 @@
+ #     Configurable build root path, same as BuildRoot: in a specfile.
+ #     (Note: the configured macro value will override the spec file value).
+ #
+-%buildroot            %{_tmppath}/%{name}-root
++%buildroot            %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
+ 
+ #     The sub-directory (relative to %{_builddir}) where sources are compiled.
+ #     This macro is set after processing %setup, either explicitly from the
+@@ -331,8 +332,8 @@
  #             "w9.gzdio"      gzip level 9 (default).
  #             "w9.bzdio"      bzip2 level 9.
  #
@@ -21,7 +35,7 @@ diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
  
  #     Archive formats to use for source/binary package payloads.
  #             "cpio"          cpio archive (default)
-@@ -481,7 +481,7 @@
+@@ -481,7 +482,7 @@
  
  #
  # Path to magic file used for file classification.
@@ -30,7 +44,7 @@ diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
  
  #==============================================================================
  # ---- Database configuration macros.
-@@ -909,10 +909,10 @@
+@@ -929,10 +930,10 @@
    export RPM_BUILD_ROOT}\
    %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
    export CLASSPATH}\
@@ -43,9 +57,9 @@ diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
    \
    %{verbose:set -x}%{!verbose:exec > /dev/null}\
    umask 022\
-@@ -1350,5 +1350,23 @@
- #%__executable_provides       @RPMCONFIGDIR@/executabledeps.sh --provides
+@@ -1371,5 +1372,23 @@
  #%__executable_requires       @RPMCONFIGDIR@/executabledeps.sh --requires
+ %__scriptlet_requires /bin/bash --rpm-requires
  
 +# PLD rpm macros
 +%_enable_debug_packages 1

diff --git a/rpm.macros b/rpm.macros
index 14250a7e52d00b7d112cd7cfdc26edd14f7b38a9..79664822df9f09d0c613afe1df1dc6c7ffd30859 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -262,9 +262,6 @@ unset DISPLAY ||:\
 # Current date
 %date          %(LC_ALL="C" date +"%a %b %d %Y")
 
-# tmp directory
-%tmpdir                %(echo "${TMPDIR:-/tmp}")
-
 # Example files, programs, scripts...
 %_examplesdir  /usr/src/examples