RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/build/ files.c pack.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Wed 19 Dec 2007 - 04:00:23 CET
Message-Id: <20071219030023.7377C34845A@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:   19-Dec-2007 04:00:23
  Branch: HEAD                             Handle: 2007121903002201

  Modified files:
    rpm                     CHANGES
    rpm/build               files.c pack.c

  Log:
    - using tagValue() rather than tagGenerate() permits changing the tagno
    	to & from arbitrary transparent. likely more needs doing.

  Summary:
    Revision    Changes     Path
    1.1998      +2  -0      rpm/CHANGES
    1.309       +1  -1      rpm/build/files.c
    2.278       +2  -1      rpm/build/pack.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1997 -r1.1998 CHANGES
  --- rpm/CHANGES	18 Dec 2007 19:40:52 -0000	1.1997
  +++ rpm/CHANGES	19 Dec 2007 03:00:22 -0000	1.1998
  @@ -1,4 +1,6 @@
   5.0b2 -> 5.0b3:
  +    - jbj: using tagValue() rather than tagGenerate() permits changing the tagno
  +	to & from arbitrary transparent. likely more needs doing.
       - jbj: reimplement %track as an arbitrary section.
       - jbj: generalize tagStore to keep track of arbitrary tag name/content.
       - jbj: move stringbuf lib -> rpmio for use by tagStore.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/files.c
  ============================================================================
  $ cvs diff -u -r1.308 -r1.309 files.c
  --- rpm/build/files.c	17 Dec 2007 07:07:41 -0000	1.308
  +++ rpm/build/files.c	19 Dec 2007 03:00:23 -0000	1.309
  @@ -2491,7 +2491,7 @@
       int xx;
   
       if (classTag == 0xffffffff)
  -	classTag = tagGenerate("Class");
  +	classTag = tagValue("Class");
   
       /* Only specific tags are added to the source package header */
     if (!spec->sourceHdrInit) {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/pack.c
  ============================================================================
  $ cvs diff -u -r2.277 -r2.278 pack.c
  --- rpm/build/pack.c	18 Dec 2007 19:40:52 -0000	2.277
  +++ rpm/build/pack.c	19 Dec 2007 03:00:23 -0000	2.278
  @@ -1130,6 +1130,7 @@
   	av = argvFree(av);
       }
   
  +    /* Load arbitrary tags into srpm header. */
       if (spec->foo)
       for (i = 0; i < spec->nfoo; i++) {
   	const char * str = spec->foo[i].str;
  @@ -1147,7 +1148,7 @@
   		he->p.str = _free(he->p.str);
   		continue;
   	    }
  -	    he->tag = tagGenerate("Trackprog");
  +	    he->tag = tagValue("Trackprog");
   	    he->t = RPM_STRING_TYPE;
   	    he->c = 1;
   	    xx = headerPut(spec->sourceHeader, he, 0);
  @@ .
Received on Wed Dec 19 04:00:23 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.