- internal file update (for compatibility with *.mgc generated by file-4.14)

[packages/rpm.git] / rpm-pld-autodep.patch

diff --git a/rpm-pld-autodep.patch b/rpm-pld-autodep.patch
index 3fdf5a24bb40877427c012eadbc8efcc4b0fcc36..a64ff1fc73bb7551facfb28de5a681a27dcd769e 100644 (file)
--- 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) {
@@ -517,7 +519,7 @@
 +    noautoreqfiles = rpmfcFreeRegexps(noautoreqfiles, noautoreqfiles_c);
 +    noautoprov = rpmfcFreeRegexps(noautoprov, noautoprov_c);
 +    noautoreq = rpmfcFreeRegexps(noautoreq, noautoreq_c);
-+#ifndef AUTODEP_NO_PKGNAMES /* define not to use package names in R */
++#ifdef AUTODEP_PKGNAMES /* define to use package names in R */
 +    rpmfcFindRequiredPackages(fc);
 +#endif
  /*@-boundswrite@*/
@@ -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)