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:   20-Oct-2007 01:44:35
  Branch: HEAD                             Handle: 2007102000443401

  Modified files:
    rpm                     CHANGES rpmpopt.in
    rpm/rpmdb               header.c header_internal.h

  Log:
    - make the --info field colons align correctly, more (#323221).

  Summary:
    Revision    Changes     Path
    1.1735      +1  -0      rpm/CHANGES
    1.96        +11 -5      rpm/rpmdb/header.c
    1.24        +5  -5      rpm/rpmdb/header_internal.h
    2.47        +3  -3      rpm/rpmpopt.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1734 -r1.1735 CHANGES
  --- rpm/CHANGES	19 Oct 2007 19:59:24 -0000	1.1734
  +++ rpm/CHANGES	19 Oct 2007 23:44:34 -0000	1.1735
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: make the --info field colons align correctly, more (#323221).
       - jbj: fix :time and :date formats, pad --info spewage.
       - jbj: eliminate padding & formatPrefix, strings is strings now.
       - jbj: bury hex dump in intFormat defaults, refactor common code.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  ============================================================================
  $ cvs diff -u -r1.95 -r1.96 header.c
  --- rpm/rpmdb/header.c	19 Oct 2007 19:59:24 -0000	1.95
  +++ rpm/rpmdb/header.c	19 Oct 2007 23:44:35 -0000	1.96
  @@ -2796,7 +2796,7 @@
    */
   static char * intFormat(HE_t he, const char *fmt)
   {
  -    int ix = (he->ix > 0 ? he->ix : 0);;
  +    int ix = (he->ix > 0 ? he->ix : 0);
       int_64 ival = 0;
       const char * istr = NULL;
       char * b;
  @@ -3130,6 +3130,8 @@
   		if (xisdigit(*start)) {
   		    i = strtoul(start, &start, 10);
   		    token->u.tag.pad += i;
  +		    start = chptr;
  +		    break;
   		} else {
   		    start++;
   		}
  @@ -3185,11 +3187,10 @@
   		return 1;
   	    }
   
  -	    start = next;
  +	    dst = start = next;
   	    /*@switchbreak@*/ break;
   
   	case '[':
  -	    *dst++ = '\0';
   	    *start++ = '\0';
   	    token = format + numTokens++;
   
  @@ -3263,8 +3264,13 @@
   
       for (i = 0; i < numTokens; i++) {
   	token = format + i;
  -	if (token->type == PTOK_STRING)
  +	switch(token->type) {
  +	default:
  +	    break;
  +	case PTOK_STRING:
   	    token->u.string.len = strlen(token->u.string.string);
  +	    break;
  +	}
       }
   
       *numTokensPtr = numTokens;
  @@ -3288,7 +3294,7 @@
   	return 1;
       }
   
  -    *chptr++ = '\0';;
  +    *chptr++ = '\0';
   
       if (*chptr != '{') {
   	hsa->errmsg = _("{ expected after ? in expression");
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header_internal.h
  ============================================================================
  $ cvs diff -u -r1.23 -r1.24 header_internal.h
  --- rpm/rpmdb/header_internal.h	17 Oct 2007 00:32:26 -0000	1.23
  +++ rpm/rpmdb/header_internal.h	19 Oct 2007 23:44:35 -0000	1.24
  @@ -143,11 +143,11 @@
   /*@-fielduse@*/
   struct sprintfToken_s {
       enum {
  -	PTOK_NONE = 0,
  -	PTOK_TAG,
  -	PTOK_ARRAY,
  -	PTOK_STRING,
  -	PTOK_COND
  +        PTOK_NONE       = 0,
  +        PTOK_TAG        = 1,
  +        PTOK_ARRAY      = 2,
  +        PTOK_STRING     = 3,
  +        PTOK_COND       = 4
       } type;
       union {
   	struct sprintfTag_s tag;	/*!< PTOK_TAG */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmpopt.in
  ============================================================================
  $ cvs diff -u -r2.46 -r2.47 rpmpopt.in
  --- rpm/rpmpopt.in	31 Aug 2007 12:59:25 -0000	2.46
  +++ rpm/rpmpopt.in	19 Oct 2007 23:44:34 -0000	2.47
  @@ -2,7 +2,7 @@
   # \verbatim
   #
   # @USRLIBRPM@/@configure_input@
  -# $Id: rpmpopt.in,v 2.46 2007/08/31 12:59:25 jbj Exp $
  +# $Id: rpmpopt.in,v 2.47 2007/10/19 23:44:34 jbj Exp $
   #
   # This file *should not be modified*. Local customizations
   # belong in /etc/popt, not here. This file will be replaced
  @@ -83,8 +83,8 @@
   rpm	alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\
   Version     : %-27{VERSION}       Vendor: %{VENDOR}\n\
   Release     : %-27{RELEASE}   Build Date: %{BUILDTIME:date}\n\
  -Install Date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed)         }|      Build Host: %{BUILDHOST}\n\
  -Group       : %-27{GROUP}   Source RPM: %{SOURCERPM}\n\
  +Install Date: %|INSTALLTIME?{%-27.27{INSTALLTIME:date}}:{(not installed)         }|   Build Host: %{BUILDHOST}\n\
  +Group       : %-29.29{GROUP} Source RPM: %{SOURCERPM}\n\
   Size        : %-27{SIZE}%|LICENSE?{      License: %{LICENSE}}|\n\
   Signature   : %|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|\n\
   %|PACKAGER?{Packager    : %{PACKAGER}\n}|\
  @@ .