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

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm                              Date:   28-Dec-2007 12:46:59
  Branch: HEAD                             Handle: 2007122811465801

  Modified files:
    rpm                     CHANGES rpmqv.c
    rpm/lib                 poptALL.c

  Log:
    make rpm --version nice and quiet again (also fixes missing
    translation)

  Summary:
    Revision    Changes     Path
    1.2030      +1  -0      rpm/CHANGES
    2.69        +4  -2      rpm/lib/poptALL.c
    1.136       +4  -2      rpm/rpmqv.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2029 -r1.2030 CHANGES
  --- rpm/CHANGES	28 Dec 2007 11:26:49 -0000	1.2029
  +++ rpm/CHANGES	28 Dec 2007 11:46:58 -0000	1.2030
  @@ -1,4 +1,5 @@
   5.0b3 -> 5.0b4:
  +    - afb: hide the rpmlib Version/Timestamp/Vendor markers spew unless verbose.
       - rse: fix %{@foo} macro stack expansion including also the value at the stack bottom
       - rse: remove the confusing additional --predefine behaviour when --define is used as the first CLI option
       - jbj: simplify expandFIFO().
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/poptALL.c
  ============================================================================
  $ cvs diff -u -r2.68 -r2.69 poptALL.c
  --- rpm/lib/poptALL.c	28 Dec 2007 11:26:50 -0000	2.68
  +++ rpm/lib/poptALL.c	28 Dec 2007 11:46:59 -0000	2.69
  @@ -157,8 +157,10 @@
   	/*@globals rpmEVR, fileSystem @*/
   	/*@modifies *fp, fileSystem @*/
   {
  -    fprintf(fp, _("%s version %s rpmlib markers (0x%08x,0x%08x,0x%08X)\n"),
  -	RPM_NAME, rpmEVR, rpmlibVersion(), rpmlibTimestamp(), rpmlibVendor());
  +    fprintf(fp, _(RPM_NAME" version %s\n"), rpmEVR);
  +    if (rpmIsVerbose())
  +	fprintf(fp, "rpmlib markers (0x%08x,0x%08x,0x%08X)\n",
  +	    rpmlibVersion(), rpmlibTimestamp(), rpmlibVendor());
   }
   
   void rpmcliConfigured(void)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmqv.c
  ============================================================================
  $ cvs diff -u -r1.135 -r1.136 rpmqv.c
  --- rpm/rpmqv.c	23 Dec 2007 20:20:14 -0000	1.135
  +++ rpm/rpmqv.c	28 Dec 2007 11:46:58 -0000	1.136
  @@ -149,8 +149,10 @@
   	/*@globals rpmEVR, fileSystem @*/
   	/*@modifies *fp, fileSystem @*/
   {
  -    fprintf(fp, _("%s version %s rpmlib markers (0x%08x,0x%08x,0x%08X)\n"),
  -	RPM_NAME, rpmEVR, rpmlibVersion(), rpmlibTimestamp(), rpmlibVendor());
  +    fprintf(fp, _(RPM_NAME" version %s\n"), rpmEVR);
  +    if (rpmIsVerbose())
  +	fprintf(fp, "rpmlib markers (0x%08x,0x%08x,0x%08X)\n",
  +	    rpmlibVersion(), rpmlibTimestamp(), rpmlibVendor());
   }
   
   static void printUsage(poptContext con, FILE * fp, int flags)
  @@ .