RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarl...@rpm5.org
  Module: rpm                              Date:   21-Oct-2011 15:51:40
  Branch: rpm-5_4                          Handle: 2011102113513901

  Modified files:           (Branch: rpm-5_4)
    rpm                     CHANGES
    rpm/macros              macros.rpmbuild.in

  Log:
    add back $RPM_BUILD_DIR to scriptlet envvar's as it's required by
    scripts/find-debuginfo.sh.

  Summary:
    Revision    Changes     Path
    1.3501.2.185+2  -0      rpm/CHANGES
    1.4.4.11    +3  -2      rpm/macros/macros.rpmbuild.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3501.2.184 -r1.3501.2.185 CHANGES
  --- rpm/CHANGES       19 Oct 2011 12:59:18 -0000      1.3501.2.184
  +++ rpm/CHANGES       21 Oct 2011 13:51:39 -0000      1.3501.2.185
  @@ -1,4 +1,6 @@
   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.
       - 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.10 -r1.4.4.11 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in     30 Sep 2011 19:54:29 -0000      1.4.4.10
  +++ rpm/macros/macros.rpmbuild.in     21 Oct 2011 13:51:40 -0000      1.4.4.11
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.10 2011/09/30 19:54:29 jbj Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.11 2011/10/21 13:51:40 pkarlsen Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -301,8 +301,9 @@
   %___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_OPT_FLAGS\
  +  export RPM_BUILD_DIR RPM_OPT_FLAGS\
     %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
     export RPM_BUILD_ROOT}\
     %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to