SOURCES: rpm-pld-autodep.patch - up

[arekm]

Author: arekm                        Date: Tue Oct 17 20:09:59 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up

---- Files affected:
SOURCES:
   rpm-pld-autodep.patch (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SOURCES/rpm-pld-autodep.patch
diff -u SOURCES/rpm-pld-autodep.patch:1.14 SOURCES/rpm-pld-autodep.patch:1.15
--- SOURCES/rpm-pld-autodep.patch:1.14	Mon Apr 17 19:29:33 2006
+++ SOURCES/rpm-pld-autodep.patch	Tue Oct 17 22:09:54 2006
@@ -363,40 +363,42 @@
  
      /* Generate package and per-file dependencies. */
      for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) {
-@@ -885,10 +1095,43 @@
+--- rpm-4.4.7/build/rpmfc.c.org	2006-10-17 22:07:32.281698500 +0200
++++ rpm-4.4.7/build/rpmfc.c	2006-10-17 22:08:38.313825250 +0200
+@@ -1076,9 +1076,43 @@
  	for (fcat = rpmfcApplyTable; fcat->func != NULL; fcat++) {
  	    if (!(fc->fcolor->vals[fc->ix] & fcat->colormask))
  		/*@innercontinue@*/ continue;
 +	    fc->findprov = 1;
 +	    fc->findreq = 1;
 +	    if (strncmp(fc->fn[fc->ix],buildroot,buildroot_l)==0) {/* sanity check */
-+		for(j = 0; j < noautoprovfiles_c; j++) {
-+		    if (!regexec(&noautoprovfiles[j],
-+			    fc->fn[fc->ix] + buildroot_l, 0, NULL, 0)) {
-+			rpmMessage(RPMMESS_NORMAL,
-+				_("skipping %s provides detection"
-+				" (matches noautoprovfiles pattern #%i)\n"),
-+				fc->fn[fc->ix], j);
-+			fc->findprov = 0;
-+			break;
++		    for(j = 0; j < noautoprovfiles_c; j++) {
++			    if (!regexec(&noautoprovfiles[j],
++						    fc->fn[fc->ix] + buildroot_l, 0, NULL, 0)) {
++				    rpmMessage(RPMMESS_NORMAL,
++						    _("skipping %s provides detection"
++							    " (matches noautoprovfiles pattern #%i)\n"),
++						    fc->fn[fc->ix], j);
++				    fc->findprov = 0;
++				    break;
++			    }
 +		    }
-+		}
-+		for(j = 0; j < noautoreqfiles_c; j++) {
-+		    if (!regexec(&noautoreqfiles[j],
-+			    fc->fn[fc->ix] + buildroot_l, 0, NULL, 0)) {
-+			rpmMessage(RPMMESS_NORMAL,
-+				_("skipping %s requires detection"
-+				" (matches noautoreqfiles pattern #%i)\n"),
-+				fc->fn[fc->ix], j);
-+			fc->findreq = 0;
-+			break;
++		    for(j = 0; j < noautoreqfiles_c; j++) {
++			    if (!regexec(&noautoreqfiles[j],
++						    fc->fn[fc->ix] + buildroot_l, 0, NULL, 0)) {
++				    rpmMessage(RPMMESS_NORMAL,
++						    _("skipping %s requires detection"
++							    " (matches noautoreqfiles pattern #%i)\n"),
++						    fc->fn[fc->ix], j);
++				    fc->findreq = 0;
++				    break;
++			    }
 +		    }
-+		}
 +	    }
++
  	    xx = (*fcat->func) (fc);
  	}
      }
- 
 +    noautoprovfiles = rpmfcFreeRegexps(noautoprovfiles, noautoprovfiles_c);
 +    noautoreqfiles = rpmfcFreeRegexps(noautoreqfiles, noautoreqfiles_c);
 +    fc->noautoprov = rpmfcFreeRegexps(fc->noautoprov, fc->noautoprov_c);
@@ -404,9 +406,9 @@
 +#ifdef AUTODEP_PKGNAMES /* define to use package names in R */
 +    rpmfcFindRequiredPackages(fc);
 +#endif
+ 
  /*@-boundswrite@*/
      /* Generate per-file indices into package dependencies. */
-     nddict = argvCount(fc->ddict);
 --- rpm-4.3/po/POTFILES.in.orig	2004-01-04 03:13:02.000000000 +0100
 +++ rpm-4.3/po/POTFILES.in	2004-02-01 21:05:50.567248776 +0100
 @@ -22,6 +22,7 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-pld-autodep.patch?r1=1.14&r2=1.15&f=u