RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 21-Oct-2011 17:39:03
Branch: rpm-5_4 Handle: 2011102115390101
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros macros.rpmbuild.in
rpm/scripts find-debuginfo.sh
Log:
- debuginfo: use current dir instead of $RPM_BUILD_DIR.
Summary:
Revision Changes Path
1.3501.2.186+1 -2 rpm/CHANGES
1.4.4.12 +2 -3 rpm/macros/macros.rpmbuild.in
1.14.2.2 +1 -0 rpm/scripts/find-debuginfo.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.185 -r1.3501.2.186 CHANGES
--- rpm/CHANGES 21 Oct 2011 13:51:39 -0000 1.3501.2.185
+++ rpm/CHANGES 21 Oct 2011 15:39:01 -0000 1.3501.2.186
@@ -1,6 +1,5 @@
5.4.3 -> 5.4.4:
- - proyvind: add back $RPM_BUILD_DIR to scriptlet envvar's as it's
required
- by scripts/find-debuginfo.sh.
+ - jbj: debuginfo: use current dir instead of $RPM_BUILD_DIR.
- proyvind: fix different epoch being ignored when comparing two packages
with same NVRA.
- proyvind: add %ruby_sitedir and %ruby_vendor macros.
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.rpmbuild.in
============================================================================
$ cvs diff -u -r1.4.4.11 -r1.4.4.12 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 21 Oct 2011 13:51:40 -0000 1.4.4.11
+++ rpm/macros/macros.rpmbuild.in 21 Oct 2011 15:39:02 -0000 1.4.4.12
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.4.11 2011/10/21 13:51:40 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.4.4.12 2011/10/21 15:39:02 jbj Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -301,9 +301,8 @@
%___build_args -e
%___build_cmd %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh}
%{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot}
}%{___build_shell} %{___build_args}
%___build_pre \
- RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
RPM_OPT_FLAGS=\"%{optflags}\"\
- export RPM_BUILD_DIR RPM_OPT_FLAGS\
+ export RPM_OPT_FLAGS\
%{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
export RPM_BUILD_ROOT}\
%{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/find-debuginfo.sh
============================================================================
$ cvs diff -u -r1.14.2.1 -r1.14.2.2 find-debuginfo.sh
--- rpm/scripts/find-debuginfo.sh 18 May 2011 13:34:35 -0000 1.14.2.1
+++ rpm/scripts/find-debuginfo.sh 21 Oct 2011 15:39:02 -0000 1.14.2.2
@@ -28,6 +28,7 @@
# Barf on missing build IDs.
strict=false
+RPM_BUILD_DIR="`pwd`"
BUILDDIR=.
out=debugfiles.list
nout=0
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
