RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 19-Oct-2008 09:46:48
Branch: HEAD Handle: 2008101907464800
Modified files:
rpm CHANGES configure.ac macros.in
Log:
add buildrootdir macro, with configure option
Summary:
Revision Changes Path
1.2619 +2 -0 rpm/CHANGES
2.318 +11 -0 rpm/configure.ac
1.258 +6 -4 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2618 -r1.2619 CHANGES
--- rpm/CHANGES 18 Oct 2008 08:29:12 -0000 1.2618
+++ rpm/CHANGES 19 Oct 2008 07:46:48 -0000 1.2619
@@ -1,5 +1,7 @@
5.2a2 -> 5.2a3:
+ - afb: make buildroot path configurable, but keep old defaults
+ - rpm.org: add %{_buildrootdir} macro for use with %{buildroot}
5.2a1 -> 5.2a2:
- jbj: permit --whatconflicts/--whatobsoletes to be displayed with
--help.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.317 -r2.318 configure.ac
--- rpm/configure.ac 14 Oct 2008 19:38:45 -0000 2.317
+++ rpm/configure.ac 19 Oct 2008 07:46:48 -0000 2.318
@@ -1498,6 +1498,17 @@
AC_MSG_RESULT([$MAGIC_MACRO])
AC_SUBST(MAGIC_MACRO)
+dnl # determine RPM buildroot directory path
+AC_MSG_CHECKING([for RPM buildroot directory])
+BUILDROOTDIR_MACRO="%{_tmppath}"
+AC_ARG_WITH(
+ [path-buildroot],
+ AS_HELP_STRING([--with-path-buildroot=ARG], [build with RPM buildroot
path (or macro)]),
+ [BUILDROOTDIR_MACRO="$withval"]
+)
+AC_MSG_RESULT([$BUILDROOTDIR_MACRO])
+AC_SUBST(BUILDROOTDIR_MACRO)
+
dnl # determine RPM locale directory path
AC_MSG_CHECKING([for RPM locale directory])
LOCALEDIR=`echo "${usrprefix}/share/locale"`
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.257 -r1.258 macros.in
--- rpm/macros.in 15 Oct 2008 18:39:28 -0000 1.257
+++ rpm/macros.in 19 Oct 2008 07:46:48 -0000 1.258
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.257 2008/10/15 18:39:28 jbj Exp $
+# $Id: macros.in,v 1.258 2008/10/19 07:46:48 afb Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -242,6 +242,9 @@
# The directory where newly built source packages will be written.
%_srcrpmdir %{_topdir}/SRPMS
+# The directory where buildroots will be created.
+%_buildrootdir @BUILDROOTDIR_MACRO@
+
# Directory where temporaray files can be created.
%_tmppath %{_var}/tmp
%tmpdir %{_tmppath}
@@ -254,10 +257,9 @@
# Macros that are initialized as a side effect of spec
# file parsing.
#
-# Configurable build root path, same as BuildRoot: in a specfile.
-# (Note: the configured macro value will override the spec file value).
+# Build root path, where %install installs the package during build.
#
-%buildroot %{_tmppath}/%{name}-root
+%buildroot %{_buildrootdir}/%{name}-root
# The sub-directory (relative to %{_builddir}) where sources are compiled.
# This macro is set after processing %setup, either explicitly from the
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
