SOURCES (AC-branch): rpm-pld-autodep.patch - merged from HEAD

[baggins]

Author: baggins                      Date: Fri Jun 17 14:40:17 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SOURCES:
   rpm-pld-autodep.patch (1.3.2.1 -> 1.3.2.2) 

---- Diffs:

================================================================
Index: SOURCES/rpm-pld-autodep.patch
diff -u SOURCES/rpm-pld-autodep.patch:1.3.2.1 SOURCES/rpm-pld-autodep.patch:1.3.2.2
--- SOURCES/rpm-pld-autodep.patch:1.3.2.1	Sun Aug 22 00:37:22 2004
+++ SOURCES/rpm-pld-autodep.patch	Fri Jun 17 16:40:12 2005
@@ -138,7 +138,7 @@
  	    /* Add to package requires. */
  	    ds = rpmdsSingle(RPMTAG_REQUIRENAME, s, "", RPMSENSE_FIND_REQUIRES);
  	    xx = rpmdsMerge(&fc->requires, ds);
-@@ -718,19 +799,22 @@
+@@ -718,21 +799,22 @@
      (void) fclose(fp);
  
      if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) {
@@ -153,11 +153,13 @@
      }
      if (fc->fcolor->vals[fc->ix] & RPMFC_PYTHON) {
 -	xx = rpmfcHelper(fc, 'P', "python");
+-#ifdef	NOTYET
 -	if (is_executable)
+-#endif
 -	    xx = rpmfcHelper(fc, 'R', "python");
 +	if (findprov)
 +	    xx = rpmfcHelper(fc, 'P', "python", noautoprov, noautoprov_c);
-+	if (findreq && is_executable)
++	if (findreq)
 +	    xx = rpmfcHelper(fc, 'R', "python", noautoreq, noautoreq_c);
      }
      if (fc->fcolor->vals[fc->ix] & RPMFC_PHP) {
@@ -305,8 +307,8 @@
      /*@=branchstate =uniondef @*/
  
      /* For DSO's, provide the basename of the file if DT_SONAME not found. */
--    if (!fc->skipProv && isDSO && !gotSONAME) {
-+    if (findprov && !fc->skipProv && isDSO && !gotSONAME) {
+-    if (!fc->skipProv && isDSO && !gotDEBUG && !gotSONAME) {
++    if (findprov && !fc->skipProv && isDSO && !gotDEBUG && !gotSONAME) {
  	depsp = &fc->provides;
  	tagN = RPMTAG_PROVIDENAME;
  	dsContext = RPMSENSE_FIND_PROVIDES;
@@ -517,9 +519,9 @@
 +    noautoreqfiles = rpmfcFreeRegexps(noautoreqfiles, noautoreqfiles_c);
 +    noautoprov = rpmfcFreeRegexps(noautoprov, noautoprov_c);
 +    noautoreq = rpmfcFreeRegexps(noautoreq, noautoreq_c);
-+
++#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);
@@ -663,3 +665,24 @@
  #: build/spec.c:237
  #, c-format
  msgid "line %d: Bad number: %s\n"
+--- rpm/configure.ac.orig	2004-08-22 13:02:30.000000000 +0200
++++ rpm/configure.ac	2004-08-22 13:25:37.000000000 +0200
+@@ -971,6 +971,18 @@
+ AC_SUBST(__CHGRP_RHF)
+ 
+ dnl
++dnl enable generating autorequires containing packages names 
++dnl
++AC_ARG_ENABLE([adding-packages-names-in-autogenerated-dependancies],
++	      [  --enable-adding-packages-names-in-autogenerated-dependancies	Add packages names for autogenerated dependancies to requires],
++	 
++		AC_MSG_RESULT([Using packages names in autogerated requires is enabled])
++		AC_DEFINE(AUTODEP_PKGNAMES, 1, "Generating autorequires containing packages names.") 
++	
++	      )
++
++
++dnl
+ dnl figure out what root's primary group is
+ dnl
+ AC_MSG_CHECKING(root's primary group)
================================================================

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