SOURCES: rpm-pld-autodep.patch - skip rpmfcFindRequiredPackages() ...

[glen]

Author: glen                         Date: Sun Feb 17 18:35:19 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- skip rpmfcFindRequiredPackages() if AUTODEP_PKGNAMES is off (headerGetEntry undefined)

---- Files affected:
SOURCES:
   rpm-pld-autodep.patch (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SOURCES/rpm-pld-autodep.patch
diff -u SOURCES/rpm-pld-autodep.patch:1.25 SOURCES/rpm-pld-autodep.patch:1.26
--- SOURCES/rpm-pld-autodep.patch:1.25	Sun Jan  6 00:07:21 2008
+++ SOURCES/rpm-pld-autodep.patch	Sun Feb 17 19:35:13 2008
@@ -16,7 +16,6 @@
  dnl # figure out what root's primary group is
  AC_MSG_CHECKING([root's primary group])
  AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
-diff -ur rpm.org/lib/rpmfc.c rpm/lib/rpmfc.c
 --- rpm.org/lib/rpmfc.c	2007-10-02 14:48:58.244068000 +0200
 +++ rpm/lib/rpmfc.c	2007-10-02 14:52:24.222380740 +0200
 @@ -17,6 +17,8 @@
@@ -236,10 +235,11 @@
  	break;
      }
      return rc;
-@@ -870,6 +961,109 @@
+@@ -870,6 +961,111 @@
      { NULL, 0 }
  };
  
++#ifdef AUTODEP_PKGNAMES /* define to use package names in R */
 +static int rpmfcFindRequiredPackages(rpmfc fc) 
 +{
 +    rpmts ts=NULL;
@@ -342,11 +342,12 @@
 +    ts = rpmtsFree(ts);
 +    return 0;
 +}
++#endif
 +
  rpmRC rpmfcApply(rpmfc fc)
  {
      rpmfcApplyTbl fcat;
-@@ -888,6 +1082,26 @@
+@@ -888,6 +1084,26 @@
      int i;
      int xx;
      int skipping;
@@ -373,7 +374,7 @@
  
  /* Make sure something didn't go wrong previously! */
  assert(fc->fn != NULL);
-@@ -911,9 +1125,43 @@
+@@ -911,9 +1127,43 @@
  	for (fcat = rpmfcApplyTable; fcat->func != NULL; fcat++) {
  	    if (!(fc->fcolor->vals[fc->ix] & fcat->colormask))
  		/*@innercontinue@*/ continue;
@@ -417,7 +418,6 @@
  
  /*@-boundswrite@*/
      /* Generate per-file indices into package dependencies. */
-diff -ur rpm.org/lib/rpmfc.h rpm/lib/rpmfc.h
 --- rpm.org/lib/rpmfc.h	2007-07-14 05:22:44.000000000 +0200
 +++ rpm/lib/rpmfc.h	2007-10-02 14:49:18.731230377 +0200
 @@ -98,6 +98,11 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-pld-autodep.patch?r1=1.25&r2=1.26&f=u