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:   09-Nov-2007 22:15:45
  Branch: HEAD                             Handle: 2007110921154401

  Modified files:
    rpm                     CHANGES
    rpm/lib                 librpm.vers rpmlib.h rpmrc.c

  Log:
    - rpm.org: Remove rpmSetMachine() from API.

  Summary:
    Revision    Changes     Path
    1.1783      +1  -0      rpm/CHANGES
    1.24        +0  -1      rpm/lib/librpm.vers
    2.445       +0  -14     rpm/lib/rpmlib.h
    2.214       +5  -3      rpm/lib/rpmrc.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1782 -r1.1783 CHANGES
  --- rpm/CHANGES	9 Nov 2007 21:04:35 -0000	1.1782
  +++ rpm/CHANGES	9 Nov 2007 21:15:44 -0000	1.1783
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rpm.org: Remove rpmSetMachine() from API.
       - jbj: hmmm, headerGetExtension should not leak memory on failure. hack it.
       - jbj: more memory leak canoodling.
       - jbj: plug a couple of memory leaks.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/librpm.vers
  ============================================================================
  $ cvs diff -u -r1.23 -r1.24 librpm.vers
  --- rpm/lib/librpm.vers	4 Nov 2007 00:23:08 -0000	1.23
  +++ rpm/lib/librpm.vers	9 Nov 2007 21:15:45 -0000	1.24
  @@ -254,7 +254,6 @@
       rpmReadPackageFile;
       rpmReadPackageManifest;
       rpmRollback;
  -    rpmSetMachine;
       rpmSetTables;
       rpmShowProgress;
       rpmShowRC;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmlib.h
  ============================================================================
  $ cvs diff -u -r2.444 -r2.445 rpmlib.h
  --- rpm/lib/rpmlib.h	20 Oct 2007 01:47:17 -0000	2.444
  +++ rpm/lib/rpmlib.h	9 Nov 2007 21:15:45 -0000	2.445
  @@ -267,20 +267,6 @@
   	/*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/;
   
   /** \ingroup rpmrc
  - * Set current arch/os names.
  - * NULL as argument is set to the default value (munged uname())
  - * pushed through a translation table (if appropriate).
  - * @deprecated Use addMacro to set _target_* macros.
  - * @todo Eliminate from API.
  - *
  - * @param arch		arch name (or NULL)
  - * @param os		os name (or NULL)
  - */
  -void rpmSetMachine(/*@null@*/ const char * arch, /*@null@*/ const char * os)
  -	/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
  -	/*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/;
  -
  -/** \ingroup rpmrc
    * Destroy rpmrc arch/os compatibility tables.
    * @todo Eliminate from API.
    */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmrc.c
  ============================================================================
  $ cvs diff -u -r2.213 -r2.214 rpmrc.c
  --- rpm/lib/rpmrc.c	3 Nov 2007 13:19:23 -0000	2.213
  +++ rpm/lib/rpmrc.c	9 Nov 2007 21:15:45 -0000	2.214
  @@ -606,9 +606,11 @@
       }
   }
   
  -void rpmSetMachine(const char * arch, const char * os)
  -	/*@globals current @*/
  -	/*@modifies current @*/
  +static void rpmSetMachine(const char * arch, const char * os)
  +	/*@globals current, rpmGlobalMacroContext, h_errno,
  +		fileSystem, internalState @*/
  +	/*@modifies current, rpmGlobalMacroContext,
  +		fileSystem, internalState @*/
   {
       if (arch == NULL) {
   /*@i@*/	defaultMachine(&arch, NULL);
  @@ .