RPM Community Forums

Mailing List Message of <rpm-devel>

Re: [CVS] RPM: rpm/ VENDOR macros.in rpmqv.c

From: Jeff Johnson <n3npq@mac.com>
Date: Sat 22 Dec 2007 - 12:26:34 CET
Message-Id: <1BAF0BE0-1942-4267-AFB6-09B32B700741@mac.com>
Perfect!

On Dec 22, 2007, at 6:06 AM, Ralf S. Engelschall wrote:

>   RPM Package Manager, CVS Repository
>   http://rpm5.org/cvs/
>    
> ______________________________________________________________________ 
> ______
>
>   Server: rpm5.org                         Name:   Ralf S. Engelschall
>   Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
>   Module: rpm                              Date:   22-Dec-2007  
> 12:06:57
>   Branch: HEAD                             Handle: 2007122211065700
>
>   Modified files:
>     rpm                     VENDOR macros.in rpmqv.c
>
>   Log:
>     allow one to control the verbose option of vcheck via RPM's -- 
> verbose
>     option
>
>   Summary:
>     Revision    Changes     Path
>     2.12        +14 -0      rpm/VENDOR
>     1.219       +2  -2      rpm/macros.in
>     1.132       +3  -0      rpm/rpmqv.c
>    
> ______________________________________________________________________ 
> ______
>
>   patch -p0 <<'@@ .'
>   Index: rpm/VENDOR
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r2.11 -r2.12 VENDOR
>   --- rpm/VENDOR	16 Dec 2007 20:38:28 -0000	2.11
>   +++ rpm/VENDOR	22 Dec 2007 11:06:57 -0000	2.12
>   @@ -268,3 +268,17 @@
>                         fnmatch(3) instead of a binary search based on
>                         strcasecmp(3).
>
>   +      
> ______________________________________________________________________ 
> __
>   +
>   +     Change:         no-auto-verbose-increase-for-track
>   +     Purpose:        Do not enforce --verbose on -bt (execute % 
> track section)
>   +     Reason:         RPM always enforces --verbose for all build  
> commands
>   +                     and this way renders the use of %{verbose:...}
>   +                     useless for all types of build scripts. For  
> all
>   +                     other scripts this is already strange since  
> years
>   +                     (although at the other hand one usually always
>   +                     wants "set -x" for the scripts by default  
> and then
>   +                     better be able to check for a --quiet  
> option via
>   +                     macros), but for %track we really want to  
> control
>   +                     verbosity explicitly.
>   +
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/macros.in
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r1.218 -r1.219 macros.in
>   --- rpm/macros.in	22 Dec 2007 10:34:18 -0000	1.218
>   +++ rpm/macros.in	22 Dec 2007 11:06:57 -0000	1.219
>   @@ -1,7 +1,7 @@
>    #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
>    # \verbatim
>    #
>   -# $Id: macros.in,v 1.218 2007/12/22 10:34:18 rse Exp $
>   +# $Id: macros.in,v 1.219 2007/12/22 11:06:57 rse 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
>   @@ -1189,7 +1189,7 @@
>    %__spec_track_shell    %{___build_shell}
>    %__spec_track_args     %{___build_args}
>    %__spec_track_cmd      %{___build_cmd}
>   -%__spec_track_pre      %{__vcheck} -f - << GO_SYSIN_DD
>   +%__spec_track_pre      %{__vcheck} %{verbose:--verbose}%{! 
> verbose:--noverbose} -f - << GO_SYSIN_DD
>    %__spec_track_body     %{___build_body}
>    %__spec_track_post     GO_SYSIN_DD\
>    %{nil}
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/rpmqv.c
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r1.131 -r1.132 rpmqv.c
>   --- rpm/rpmqv.c	6 Dec 2007 21:46:52 -0000	1.131
>   +++ rpm/rpmqv.c	22 Dec 2007 11:06:57 -0000	1.132
>   @@ -607,6 +607,9 @@
>        case MODE_BUILD:
>        case MODE_TARBUILD:
>        {	const char * pkg;
>   +#if !defined(RPM_VENDOR_OPENPKG) /* no-auto-verbose-increase-for- 
> track */
>   +	if (ba->buildChar != 't')
>   +#endif
>            while (!rpmIsVerbose())
>    	    rpmIncreaseVerbosity();
>
>   @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org
Received on Sat Dec 22 12:27:11 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.