[CVS] RPM: rpm-5_3: rpm/build/ reqprov.c

2011-04-01 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   01-Apr-2011 12:40:16
  Branch: rpm-5_3  Handle: 2011040110401600

  Modified files:   (Branch: rpm-5_3)
rpm/build   reqprov.c

  Log:
skip overlapping packages with lesser EVR

  Summary:
RevisionChanges Path
1.90.4.6+3  -0  rpm/build/reqprov.c
  

  patch -p0 '@@ .'
  Index: rpm/build/reqprov.c
  
  $ cvs diff -u -r1.90.4.5 -r1.90.4.6 reqprov.c
  --- rpm/build/reqprov.c   1 Apr 2011 09:53:29 -   1.90.4.5
  +++ rpm/build/reqprov.c   1 Apr 2011 10:40:16 -   1.90.4.6
  @@ -128,6 +128,9 @@
lEVR-Flags = Flags | RPMSENSE_EQUAL;
rEVR-Flags = flags[len] | RPMSENSE_EQUAL;
overlap = rpmEVRoverlap(lEVR, rEVR);
  + if (!overlap)
  + if (rpmEVRoverlap(rEVR, lEVR))
  + duplicate = 1;
lEVR = rpmEVRfree(lEVR);
rEVR = rpmEVRfree(rEVR);
}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/build/ reqprov.c

2011-03-16 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   16-Mar-2011 15:58:02
  Branch: rpm-5_3  Handle: 2011031614580200

  Modified files:   (Branch: rpm-5_3)
rpm/build   reqprov.c

  Log:
isolate additional duplicate check under mandriva ifdef

  Summary:
RevisionChanges Path
1.90.4.3+2  -0  rpm/build/reqprov.c
  

  patch -p0 '@@ .'
  Index: rpm/build/reqprov.c
  
  $ cvs diff -u -r1.90.4.2 -r1.90.4.3 reqprov.c
  --- rpm/build/reqprov.c   6 Mar 2011 14:10:49 -   1.90.4.2
  +++ rpm/build/reqprov.c   16 Mar 2011 14:58:02 -  1.90.4.3
  @@ -56,6 +56,7 @@
   
   if (EVR == NULL)
EVR = ;
  +#if defined(RPM_VENDOR_MANDRIVA)
   /* Check that provide isn't duplicate of package */
   else if (nametag == RPMTAG_PROVIDENAME) {
const char *pName,
  @@ -74,6 +75,7 @@
if (duplicate)
return 0;
   }
  +#endif
   
   /* Check for duplicate dependencies. */
   he-tag = nametag;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/build/ reqprov.c

2011-03-16 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   16-Mar-2011 16:24:17
  Branch: rpm-5_3  Handle: 2011031615241700

  Modified files:   (Branch: rpm-5_3)
rpm/build   reqprov.c

  Log:
get %{NAME} in same call to headerSprintf()

  Summary:
RevisionChanges Path
1.90.4.4+6  -9  rpm/build/reqprov.c
  

  patch -p0 '@@ .'
  Index: rpm/build/reqprov.c
  
  $ cvs diff -u -r1.90.4.3 -r1.90.4.4 reqprov.c
  --- rpm/build/reqprov.c   16 Mar 2011 14:58:02 -  1.90.4.3
  +++ rpm/build/reqprov.c   16 Mar 2011 15:24:17 -  1.90.4.4
  @@ -59,18 +59,15 @@
   #if defined(RPM_VENDOR_MANDRIVA)
   /* Check that provide isn't duplicate of package */
   else if (nametag == RPMTAG_PROVIDENAME) {
  - const char *pName,
  -   *pEVR;
  + const char *NEVR;
  + size_t len;
int duplicate;
   
  - he-tag = RPMTAG_NAME;
  - xx = headerGet(h, he, 0);
  - pName = he-p.str;
  - pEVR = headerSprintf(h, %|EPOCH?{%{EPOCH}:}|%{VERSION}-%{RELEASE}, 
NULL, NULL, NULL);
  - duplicate = !strcmp(pName, N)  !strcmp(pEVR, EVR);
  + len = strlen(N);
  + NEVR = headerSprintf(h, 
%{NAME}-%|EPOCH?{%{EPOCH}:}|%{VERSION}-%{RELEASE}, NULL, NULL, NULL);
  + duplicate = !strncmp(NEVR, N, len)  !strcmp(NEVR+len+1, EVR);
   
  - _free(pName);
  - _free(pEVR);
  + _free(NEVR);
   
if (duplicate)
return 0;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/build/ reqprov.c

2010-10-18 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   18-Oct-2010 09:03:09
  Branch: rpm-5_3  Handle: 2010101807030800

  Modified files:   (Branch: rpm-5_3)
rpm/build   reqprov.c

  Log:
- remove compiler warning.

  Summary:
RevisionChanges Path
1.90.4.1+1  -1  rpm/build/reqprov.c
  

  patch -p0 '@@ .'
  Index: rpm/build/reqprov.c
  
  $ cvs diff -u -r1.90 -r1.90.4.1 reqprov.c
  --- rpm/build/reqprov.c   2 Aug 2008 20:06:51 -   1.90
  +++ rpm/build/reqprov.c   18 Oct 2010 07:03:08 -  1.90.4.1
  @@ -127,7 +127,7 @@
   
he-tag = flagtag;
he-t = RPM_UINT32_TYPE;
  - he-p.ui32p = (rpmuint32_t *) Flags;
  + he-p.ui32p = (void *) Flags;
he-c = 1;
he-append = 1;
xx = headerPut(h, he, 0);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org