RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES build.c macros.in

From: Jeff Johnson <jbj@rpm5.org>
Date: Wed 19 Dec 2007 - 20:38:35 CET
Message-Id: <20071219193835.C9B1534845A@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   19-Dec-2007 20:38:35
  Branch: HEAD                             Handle: 2007121919383500

  Modified files:
    rpm                     CHANGES build.c macros.in

  Log:
    - jbj: functional rpmbuild -bt foo.spec (if %track is present in
    foo.spec).

  Summary:
    Revision    Changes     Path
    1.2000      +1  -0      rpm/CHANGES
    2.116       +1  -1      rpm/build.c
    1.216       +5  -4      rpm/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1999 -r1.2000 CHANGES
  --- rpm/CHANGES	19 Dec 2007 03:50:40 -0000	1.1999
  +++ rpm/CHANGES	19 Dec 2007 19:38:35 -0000	1.2000
  @@ -1,4 +1,5 @@
   5.0b2 -> 5.0b3:
  +    - jbj: functional rpmbuild -bt foo.spec (if %track is present in foo.spec).
       - jbj: fix: insure that %{name} is expanded correctly in srpm paths.
       - jbj: using tagValue() rather than tagGenerate() permits changing the tagno
   	to & from arbitrary transparent. likely more needs doing.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build.c
  ============================================================================
  $ cvs diff -u -r2.115 -r2.116 build.c
  --- rpm/build.c	3 Dec 2007 15:42:37 -0000	2.115
  +++ rpm/build.c	19 Dec 2007 19:38:35 -0000	2.116
  @@ -114,7 +114,7 @@
       size_t nb = strlen(arg) + BUFSIZ;
       char * buf = alloca(nb);
       Spec spec = NULL;
  -    int verify = 1;
  +    int verify = ((ba->buildAmount & RPMBUILD_TRACK) ? 0 : 1);
       int xx;
       int rc;
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  ============================================================================
  $ cvs diff -u -r1.215 -r1.216 macros.in
  --- rpm/macros.in	18 Dec 2007 19:40:52 -0000	1.215
  +++ rpm/macros.in	19 Dec 2007 19:38:35 -0000	1.216
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.215 2007/12/18 19:40:52 jbj Exp $
  +# $Id: macros.in,v 1.216 2007/12/19 19:38:35 jbj 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
  @@ -85,7 +85,7 @@
   %__tar			@__TAR@
   %__tclsh		@__TCLSH@
   %__unzip		@__UNZIP@
  -%__vcheck		%{__rpmhome}/vcheck
  +%__vcheck		%{_rpmhome}/vcheck
   %__wget			@__WGET@
   %__xar			@__XAR@
   
  @@ -1189,9 +1189,10 @@
   %__spec_track_shell    %{___build_shell}
   %__spec_track_args     %{___build_args}
   %__spec_track_cmd      %{___build_cmd}
  -%__spec_track_pre      %{___build_pre}
  +%__spec_track_pre      %{__vcheck} -f - << GO_SYSIN_DD
   %__spec_track_body     %{___build_body}
  -%__spec_track_post     %{___build_post}
  +%__spec_track_post     GO_SYSIN_DD\
  +%{nil}
   %__spec_track_template #!%{__spec_track_shell}\
   %{__spec_track_pre}\
   %{nil}
  @@ .
Received on Wed Dec 19 20:38:35 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.