RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES build.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Sun 18 Nov 2007 - 20:51:26 CET
Message-Id: <20071118195126.B35B4348476@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:   18-Nov-2007 20:51:26
  Branch: HEAD                             Handle: 2007111819512600

  Modified files:
    rpm                     CHANGES build.c

  Log:
    - jbj: fix: handle absolute paths to spec files again.

  Summary:
    Revision    Changes     Path
    1.1843      +1  -0      rpm/CHANGES
    2.112       +2  -2      rpm/build.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1842 -r1.1843 CHANGES
  --- rpm/CHANGES	18 Nov 2007 17:18:28 -0000	1.1842
  +++ rpm/CHANGES	18 Nov 2007 19:51:26 -0000	1.1843
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +    - jbj: fix: handle absolute paths to spec files again.
       - jbj: fix: don't attempt header sanity checks on pubkeys.
       - jbj: fix: don't loop on failed lookup by instance.
       - jbj: Eliminate SUPPORT_RPMV3_PROVIDE_SELF Provies: N = E:V-R retrofit.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build.c
  ============================================================================
  $ cvs diff -u -r2.111 -r2.112 build.c
  --- rpm/build.c	11 Oct 2007 19:44:21 -0000	2.111
  +++ rpm/build.c	18 Nov 2007 19:51:26 -0000	2.112
  @@ -190,10 +190,10 @@
   		se += strlen(se);
   	    else
   		se = stpcpy(se, ".");
  +	    *se++ = '/';
  +	    se += strlen(strcpy(se,basename(strcpy(se, s))));
   	} else
   	    se = stpcpy(se, s);
  -	*se++ = '/';
  -	se += strlen(basename(strcpy(se, s)));
   	specURL = rpmGetPath(buf, NULL);
   	specut = urlPath(specURL, &specFile);
       }
  @@ .
Received on Sun Nov 18 20:51:26 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.