- perl.req: avoid regex misfire on '^use' in "= <<" assign (#109934).

- use perldeps {--provides|--requires}.

CVS patchset: 7037
CVS date: 2003/12/28 15:14:40

CHANGES

@@ -29,6 +29,8 @@
 	- merge sensible parts of openpkg rpm.patch.bugfix (#104780).
 	- mark _javadocdir as documentation (#102898).
 	- flush pipe before exit 1 in check-files (#103867).
+	- perl.req: avoid regex misfire on '^use' in "= <<" assign (#109934).
+	- use perldeps {--provides|--requires}.
 
 4.2 -> 4.2.1:
 	- fix: nested %if handling, optind initialization posix vs. glibc.

macros.in

@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.142 2003/12/25 19:02:01 jbj Exp $
+# $Id: macros.in,v 1.143 2003/12/28 15:14:40 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -367,10 +367,10 @@ package or when debugging this package.\
 #
 # Note: Used iff _use_internal_dependency_generator is non-zero. The
 # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires).
-#%__perl_provides	/usr/lib/rpm/perldeps --provides
-#%__perl_requires	/usr/lib/rpm/perldeps --requires
-%__perl_provides	@RPMCONFIGDIR@/perl.prov
-%__perl_requires	@RPMCONFIGDIR@/perl.req
+%__perl_provides	@RPMCONFIGDIR@/perldeps --provides
+%__perl_requires	@RPMCONFIGDIR@/perldeps --requires
+#%__perl_provides	@RPMCONFIGDIR@/perl.prov
+#%__perl_requires	@RPMCONFIGDIR@/perl.req
 
 #
 # fixowner, fixgroup, and fixperms are run at the end of hardcoded setup

scripts/perl.req

@@ -80,6 +80,16 @@ sub process_file {
   
   while (<FILE>) {
     
+    # skip the "= <<" block
+
+    if ( ( m/^\s*\$(.*)\s*=\s*<<\s*["'](.*)['"]/i) ||
+         ( m/^\s*\$(.*)\s*=\s*<<\s*(.*);/i) ) {
+      $tag = $2;
+      while (<FILE>) {
+        ( $_ =~ /^$tag/) && last;
+      }
+    }
+
     # skip the documentation
 
     # we should not need to have item in this if statement (it