X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-pld-autodep.patch;h=a64ff1fc73bb7551facfb28de5a681a27dcd769e;hp=1f5eda63ac052f46d11d093960851f5b34775ae8;hb=a2ec87edef94937fe8cd38c497618d0122eadd20;hpb=0579a2723596085501377303de90ce3c7b028b6d

diff --git a/rpm-pld-autodep.patch b/rpm-pld-autodep.patch
index 1f5eda6..a64ff1f 100644
--- a/rpm-pld-autodep.patch
+++ b/rpm-pld-autodep.patch
@@ -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) {
@@ -364,7 +366,7 @@
 +    regex_t *noautoreqdep;
 +    int noautoreqdep_c;
 +
-+    noautoreqdep=rpmfcExpandRegexps("%{_noautoreqdep}",&noautoreqdep_c);
++    noautoreqdep=rpmfcExpandRegexps("%{__noautoreqdep}", &noautoreqdep_c);
 +    
 +    ts = rpmtsCreate(); /* XXX ts created in main() should be used */
 +    
@@ -468,12 +470,12 @@
 +    buildroot = rpmExpand("%{buildroot}",NULL);
 +    buildroot_l = strlen(buildroot);
 +    
-+    noautoprovfiles = rpmfcExpandRegexps("%{_noautoprovfiles}",&noautoprovfiles_c);
-+    noautoreqfiles = rpmfcExpandRegexps("%{_noautoreqfiles}",&noautoreqfiles_c);
-+    noautoprov = rpmfcExpandRegexps("%{_noautoprov}",&noautoprov_c);
-+    noautoreq = rpmfcExpandRegexps("%{_noautoreq}",&noautoreq_c);
-+    rpmMessage(RPMMESS_DEBUG, _("%i _noautoprov patterns.\n"),noautoprov_c);
-+    rpmMessage(RPMMESS_DEBUG, _("%i _noautoreq patterns.\n"),noautoreq_c);
++    noautoprovfiles = rpmfcExpandRegexps("%{__noautoprovfiles}", &noautoprovfiles_c);
++    noautoreqfiles = rpmfcExpandRegexps("%{__noautoreqfiles}", &noautoreqfiles_c);
++    noautoprov = rpmfcExpandRegexps("%{__noautoprov}", &noautoprov_c);
++    noautoreq = rpmfcExpandRegexps("%{__noautoreq}", &noautoreq_c);
++    rpmMessage(RPMMESS_DEBUG, _("%i _noautoprov patterns.\n"), noautoprov_c);
++    rpmMessage(RPMMESS_DEBUG, _("%i _noautoreq patterns.\n"), noautoreq_c);
  
      /* Generate package and per-file dependencies. */
      for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) {
@@ -513,13 +515,13 @@
  	}
      }
  
-+    noautoprovfiles = rpmfcFreeRegexps(noautoprovfiles,noautoprovfiles_c);
-+    noautoreqfiles = rpmfcFreeRegexps(noautoreqfiles,noautoreqfiles_c);
++    noautoprovfiles = rpmfcFreeRegexps(noautoprovfiles, noautoprovfiles_c);
++    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)