[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm-5_4: rpm/build/ parsePreamble.c parseSpec.c rpmspec.h s...
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2014-09-24 16:20:23
Message-ID: 20140924162023.D1C067C4D3 () rpm5 ! org
[Download RAW message or body]

  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:   24-Sep-2014 18:20:23
  Branch: rpm-5_4                          Handle: 2014092416202201

  Modified files:           (Branch: rpm-5_4)
    rpm/build               parsePreamble.c parseSpec.c rpmspec.h spec.c

  Log:
    *** empty log message ***

  Summary:
    Revision    Changes     Path
    2.194.2.10  +11 -1      rpm/build/parsePreamble.c
    2.143.4.7   +1  -0      rpm/build/parseSpec.c
    2.87.2.1    +5  -0      rpm/build/rpmspec.h
    2.211.2.4   +1  -0      rpm/build/spec.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/build/parsePreamble.c
  ============================================================================
  $ cvs diff -u -r2.194.2.9 -r2.194.2.10 parsePreamble.c
  --- rpm/build/parsePreamble.c	10 Sep 2014 20:05:29 -0000	2.194.2.9
  +++ rpm/build/parsePreamble.c	24 Sep 2014 16:20:22 -0000	2.194.2.10
  @@ -649,16 +649,26 @@
       if (*end != '\0')
   	multiToken = 1;
   
  +    /* Override RPMTAG_RELEASE value. */
  +    switch (tag) {
  +    default:
  +	break;
  +    case RPMTAG_RELEASE:
  +fprintf(stderr, "*** Release: %s\n", field);
  +	break;
  +    }
  +
  +    /* Add preamble tag to header. */
       switch (tag) {
       case RPMTAG_NAME:
       case RPMTAG_VERSION:
       case RPMTAG_RELEASE:
       case RPMTAG_DISTEPOCH:
  -    case RPMTAG_URL:
       case RPMTAG_DISTTAG:
       case RPMTAG_REPOTAG:
       case RPMTAG_CVSID:
       case RPMTAG_BUGURL:
  +    case RPMTAG_URL:
   	SINGLE_TOKEN_ONLY;
   	/* These macros are for backward compatibility */
   	if (tag == RPMTAG_VERSION) {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/parseSpec.c
  ============================================================================
  $ cvs diff -u -r2.143.4.6 -r2.143.4.7 parseSpec.c
  --- rpm/build/parseSpec.c	29 Aug 2014 17:27:52 -0000	2.143.4.6
  +++ rpm/build/parseSpec.c	24 Sep 2014 16:20:23 -0000	2.143.4.7
  @@ -117,6 +117,7 @@
   
   /**
    */
  +RPM_GNUC_PURE
   static int matchTok(const char *token, const char *line)
   	/*@*/
   {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/rpmspec.h
  ============================================================================
  $ cvs diff -u -r2.87 -r2.87.2.1 rpmspec.h
  --- rpm/build/rpmspec.h	20 Jun 2010 00:17:51 -0000	2.87
  +++ rpm/build/rpmspec.h	24 Sep 2014 16:20:23 -0000	2.87.2.1
  @@ -347,6 +347,7 @@
    * @return          a SpecSource structure, NULL if not found
    */
   SpecSource getSource(Spec spec, int num)
  +	RPM_GNUC_PURE
   	/*@*/;
   
   /** \ingroup rpmbuild
  @@ -356,6 +357,7 @@
    */
   /*@exposed@*/
   const char * specSourceName(SpecSource source)
  +	RPM_GNUC_PURE
   	/*@*/;
   
   /** \ingroup rpmbuild
  @@ -365,6 +367,7 @@
    */
   /*@exposed@*/
   const char * specFullSourceName(SpecSource source)
  +	RPM_GNUC_PURE
   	/*@*/;
   
   /** \ingroup rpmbuild
  @@ -373,6 +376,7 @@
    * @return          the number of the source
    */
   int specSourceNum(SpecSource source)
  +	RPM_GNUC_PURE
   	/*@*/;
   
   /** \ingroup rpmbuild
  @@ -381,6 +385,7 @@
    * @return          flags
    */
   int specSourceFlags(SpecSource source)
  +	RPM_GNUC_PURE
   	/*@*/;
   
   /** \ingroup rpmbuild
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/spec.c
  ============================================================================
  $ cvs diff -u -r2.211.2.3 -r2.211.2.4 spec.c
  --- rpm/build/spec.c	29 Jul 2013 05:11:18 -0000	2.211.2.3
  +++ rpm/build/spec.c	24 Sep 2014 16:20:23 -0000	2.211.2.4
  @@ -252,6 +252,7 @@
   
   /**
    */
  +RPM_GNUC_PURE
   static inline /*@owned@*/ struct Source *findSource(Spec spec, rpmuint32_t num, int flag)
   	/*@*/
   {
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]