TU! 73 de Jeff
On Mar 16, 2011, at 10:54 AM, Per Øyvind Karlsen wrote: > 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:54:06 > Branch: HEAD Handle: 2011031614540600 > > Modified files: > rpm/build reqprov.c > > Log: > isolate additional duplicate check under mandriva ifdef > > Summary: > Revision Changes Path > 1.93 +2 -0 rpm/build/reqprov.c > ____________________________________________________________________________ > > patch -p0 <<'@@ .' > Index: rpm/build/reqprov.c > ============================================================================ > $ cvs diff -u -r1.92 -r1.93 reqprov.c > --- rpm/build/reqprov.c 6 Mar 2011 14:09:29 -0000 1.92 > +++ rpm/build/reqprov.c 16 Mar 2011 14:54:06 -0000 1.93 > @@ -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 Manager http://rpm5.org > CVS Sources Repository rpm-...@rpm5.org ______________________________________________________________________ RPM Package Manager http://rpm5.org Developer Communication List rpm-devel@rpm5.org
