- disable perl module magic rule.

CVS patchset: 5976
CVS date: 2002/12/27 18:01:00

diff --git a/CHANGES b/CHANGES
index 6bcbb92..a92cd3b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -78,6 +78,7 @@
        - permit both relative/absolute paths, display 'P' when verifying.
        - resurrect automagic perl(foo) dependency generation.
        - add BETA-GPG-KEY (but not in headers using %%pubkey yet).
+       - disable perl module magic rule.
 
 4.0.4 -> 4.1:
        - loosely wire beecrypt library into rpm.

diff --git a/build/rpmfc.c b/build/rpmfc.c
index 679753e..0a6e5f0 100644 (file)
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -443,7 +443,7 @@ static struct rpmfcTokens_s rpmfcTokens[] = {
   { "troff or preprocessor input",             RPMFC_MANPAGE },
 
   { "perl script text",                RPMFC_PERL|RPMFC_INCLUDE },
-  { "Perl5 module source text", RPMFC_PERL|RPMFC_INCLUDE },
+  { "Perl5 module source text", RPMFC_PERL|RPMFC_MODULE|RPMFC_INCLUDE },
 
   { "current ar archive",      RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE },
 
@@ -707,8 +707,9 @@ static int rpmfcSCRIPT(rpmfc fc)
     (void) fclose(fp);
 
     if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) {
-       xx = rpmfcHelper(fc, 'P', "perl");
-       if (is_executable || fc->fcolor->vals[fc->ix] & RPMFC_TEXT)
+       if (fc->fcolor->vals[fc->ix] & RPMFC_MODULE)
+           xx = rpmfcHelper(fc, 'P', "perl");
+       if (is_executable || (fc->fcolor->vals[fc->ix] & RPMFC_MODULE))
            xx = rpmfcHelper(fc, 'R', "perl");
     }
     if (fc->fcolor->vals[fc->ix] & RPMFC_PYTHON) {

diff --git a/build/rpmfc.h b/build/rpmfc.h
index 92b92c7..62145fc 100644 (file)
--- a/build/rpmfc.h
+++ b/build/rpmfc.h
@@ -51,6 +51,7 @@ enum FCOLOR_e {
     RPMFC_ELF64                        = (1 <<  1),
 #define        RPMFC_ELF       (RPMFC_ELF32|RPMFC_ELF64)
 
+    RPMFC_MODULE               = (1 <<  7),
     RPMFC_EXECUTABLE           = (1 <<  8),
     RPMFC_SCRIPT               = (1 <<  9),
     RPMFC_TEXT                 = (1 << 10),

diff --git a/file/Magdir/perl b/file/Magdir/perl
index 28b6086..2c16986 100644 (file)
--- a/file/Magdir/perl
+++ b/file/Magdir/perl
@@ -15,4 +15,4 @@
 # a couple more, by me
 # XXX: christos matches
 #0     regex           package         Perl5 module source text (via regex)
-0      string          package         Perl5 module source text
+#0     string          package         Perl5 module source text

diff --git a/rpm.spec.in b/rpm.spec.in
index fd7abb1..a60326c 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -457,6 +457,7 @@ exit 0
 %changelog
 * Fri Dec 27 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.40
 - add BETA-GPG-KEY (but not in headers using %%pubkey yet).
+- disable perl module magic rule.
 
 * Thu Dec 26 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.39
 - add Red Hat pubkeys to rpm header.