RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm-4_5: rpm/ CHANGES rpm/lib/ rpmevr.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Sat 08 Dec 2007 - 06:26:18 CET
Message-Id: <20071208052618.714D734848D@rpm5.org>
  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:   08-Dec-2007 06:26:18
  Branch: rpm-4_5                          Handle: 2007120805261701

  Modified files:           (Branch: rpm-4_5)
    rpm                     CHANGES
    rpm/lib                 rpmevr.c

  Log:
    - leave EVRcmp change as Mandriva specific for now.

  Summary:
    Revision    Changes     Path
    1.1360.2.54 +1  -0      rpm/CHANGES
    1.2.2.2     +5  -0      rpm/lib/rpmevr.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1360.2.53 -r1.1360.2.54 CHANGES
  --- rpm/CHANGES	13 Nov 2007 13:32:47 -0000	1.1360.2.53
  +++ rpm/CHANGES	8 Dec 2007 05:26:17 -0000	1.1360.2.54
  @@ -1,4 +1,5 @@
   4.4.9 -> 4.5:
  +    - jbj: leave EVRcmp change as Mandriva specific for now.
       - jbj: don't cache unsatisfied Suggests:.
       - jbj: insturment headerNextIterator() statistics (noop in rpm-4.5).
       - jbj: enlarge scope of he->avail test to include header extension cache.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmevr.c
  ============================================================================
  $ cvs diff -u -r1.2.2.1 -r1.2.2.2 rpmevr.c
  --- rpm/lib/rpmevr.c	6 Dec 2007 23:53:42 -0000	1.2.2.1
  +++ rpm/lib/rpmevr.c	8 Dec 2007 05:26:18 -0000	1.2.2.2
  @@ -18,8 +18,13 @@
   #endif
   
   /* XXX Force digits to beat alphas. See bugzilla #50977. */
  +#if defined(RPM_VENDOR_MANDRIVA)
   /*@unchecked@*/
   static int _invert_digits_alphas_comparison = 1;
  +#else
  +/*@unchecked@*/
  +static int _invert_digits_alphas_comparison = -1;
  +#endif
   
   /* XXX Punctuation characters that are not treated as alphas */
   /*@unchecked@*/ /*@observer@*/
  @@ .
Received on Sat Dec 8 06:26:18 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.