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:   18-Jan-2008 18:00:53
  Branch: HEAD                             Handle: 2008011817005200

  Modified files:
    rpm                     CHANGES rpmqv.c
    rpm/build               poptBT.c spec.c
    rpm/lib                 cpio.c

  Log:
    - jbj: fix several typos noticed by the translation project.
    - jbj: add -noautoreq/--noautoprov options to rpmbuild.

  Summary:
    Revision    Changes     Path
    1.2076      +2  -0      rpm/CHANGES
    2.21        +7  -7      rpm/build/poptBT.c
    2.176       +5  -2      rpm/build/spec.c
    2.137       +1  -1      rpm/lib/cpio.c
    1.141       +1  -1      rpm/rpmqv.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2075 -r1.2076 CHANGES
  --- rpm/CHANGES	17 Jan 2008 11:57:44 -0000	1.2075
  +++ rpm/CHANGES	18 Jan 2008 17:00:52 -0000	1.2076
  @@ -1,4 +1,6 @@
   5.0.0 -> 5.1a1:
  +    - jbj: fix several typos noticed by the translation project.
  +    - jbj: add -noautoreq/--noautoprov options to rpmbuild.
       - proyvind: Rename rpmcliImportPubkey() -> rpmtsImportPubkey() (from and for a hint of rpm.org API compatibility;)
       - proyvind: expose more functions in rpmps API (as rpm.org, initially based on us ;p)
       - jbj: fix: plug memory leak with digest algos array.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/poptBT.c
  ============================================================================
  $ cvs diff -u -r2.20 -r2.21 poptBT.c
  --- rpm/build/poptBT.c	23 Dec 2007 20:18:49 -0000	2.20
  +++ rpm/build/poptBT.c	18 Jan 2008 17:00:52 -0000	2.21
  @@ -47,10 +47,8 @@
   #define	POPT_TP			0x7470
   #define	POPT_TS			0x7473
   
  -/*@-redecl@*/
   /*@unchecked@*/
  -extern int _fsm_debug;
  -/*@=redecl@*/
  +int _rpmbuildAutoFlags = 3;
   
   /*@-exportlocal@*/
   /*@unchecked@*/
  @@ -200,12 +198,14 @@
   
    { "clean", '\0', 0, NULL, POPT_RMBUILD,
   	N_("remove build tree when done"), NULL},
  - { "fsmdebug", '\0', (POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN), &_fsm_debug, -1,
  -	N_("debug file state machine"), NULL},
    { "nobuild", '\0', 0, NULL, POPT_NOBUILD,
   	N_("do not execute any stages of the build"), NULL },
    { "nodeps", '\0', 0, NULL, RPMCLI_POPT_NODEPS,
   	N_("do not verify build dependencies"), NULL },
  + { "noautoprov", '\0', POPT_BIT_CLR|POPT_ARGFLAG_DOC_HIDDEN, &_rpmbuildAutoFlags, 1,
  +	N_("disable automagic Provides: extraction"), NULL },
  + { "noautoreq", '\0', POPT_BIT_CLR|POPT_ARGFLAG_DOC_HIDDEN, &_rpmbuildAutoFlags, 2,
  +	N_("disable automagic Requires: extraction"), NULL },
   
    { "nodigest", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, RPMCLI_POPT_NODIGEST,
           N_("don't verify package digest(s)"), NULL },
  @@ -215,7 +215,7 @@
           N_("don't verify package signature(s)"), NULL },
   
    { "nolang", '\0', POPT_ARGFLAG_DOC_HIDDEN, &noLang, POPT_NOLANG,
  -	N_("do not accept i18N msgstr's from specfile"), NULL},
  +	N_("do not accept i18n msgstr's from specfile"), NULL},
    { "rmsource", '\0', 0, NULL, POPT_RMSOURCE,
   	N_("remove sources when done"), NULL},
    { "rmspec", '\0', 0, NULL, POPT_RMSPEC,
  @@ -227,7 +227,7 @@
    { "target", '\0', POPT_ARG_STRING, NULL,  RPMCLI_POPT_TARGETPLATFORM,
   	N_("override target platform"), N_("CPU-VENDOR-OS") },
    { "usecatalog", '\0', POPT_ARGFLAG_DOC_HIDDEN, &useCatalog, POPT_USECATALOG,
  -	N_("lookup i18N strings in specfile catalog"), NULL},
  +	N_("look up i18n strings in specfile catalog"), NULL},
   
      POPT_TABLEEND
   };
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/spec.c
  ============================================================================
  $ cvs diff -u -r2.175 -r2.176 spec.c
  --- rpm/build/spec.c	1 Jan 2008 02:00:16 -0000	2.175
  +++ rpm/build/spec.c	18 Jan 2008 17:00:52 -0000	2.176
  @@ -17,6 +17,9 @@
   extern int specedit;
   /*@=redecl@*/
   
  +/*@unchecked@*/
  +extern int _rpmbuildAutoFlags;
  +
   #define SKIPWHITE(_x)	{while(*(_x) && (xisspace(*_x) || *(_x) == ',')) (_x)++;}
   #define SKIPNONWHITE(_x){while(*(_x) &&!(xisspace(*_x) || *(_x) == ',')) (_x)++;}
   
  @@ -122,8 +125,8 @@
       p->header = headerNew();
       p->ds = NULL;
   
  -    p->autoProv = 1;
  -    p->autoReq = 1;
  +    p->autoProv = ((_rpmbuildAutoFlags & 0x1) != 0);
  +    p->autoReq = ((_rpmbuildAutoFlags & 0x2) != 0);
       
   #if 0    
       p->reqProv = NULL;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/cpio.c
  ============================================================================
  $ cvs diff -u -r2.136 -r2.137 cpio.c
  --- rpm/lib/cpio.c	19 Nov 2007 17:07:47 -0000	2.136
  +++ rpm/lib/cpio.c	18 Jan 2008 17:00:52 -0000	2.137
  @@ -231,7 +231,7 @@
   	s = NULL;
   	break;
       case CPIOERR_BAD_MAGIC:	s = _("Bad magic");		break;
  -    case CPIOERR_BAD_HEADER:	s = _("Bad/unreadable  header");break;
  +    case CPIOERR_BAD_HEADER:	s = _("Bad/unreadable header");	break;
   
       case CPIOERR_OPEN_FAILED:	s = "open";	break;
       case CPIOERR_CHMOD_FAILED:	s = "chmod";	break;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmqv.c
  ============================================================================
  $ cvs diff -u -r1.140 -r1.141 rpmqv.c
  --- rpm/rpmqv.c	5 Jan 2008 08:42:49 -0000	1.140
  +++ rpm/rpmqv.c	18 Jan 2008 17:00:52 -0000	1.141
  @@ -633,7 +633,7 @@
   
       if (ia->noDeps & (bigMode & ~MODES_FOR_NODEPS))
   	argerror(_("--nodeps may only be specified during package "
  -		   "building, rebuilding, recompilation, installation,"
  +		   "building, rebuilding, recompilation, installation, "
   		   "erasure, and verification"));
   
       if ((ia->transFlags & RPMTRANS_FLAG_TEST) && (bigMode & ~MODES_FOR_TEST))
  @@ .