[packages/rpm.git] / rpm-perl-macros.patch

--- rpm-4.1/scripts/perl.req.wiget	Mon Jun  3 22:56:33 2002
+++ rpm-4.1/scripts/perl.req	Wed Sep 18 23:50:15 2002
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@__PERL@
 
 # RPM (and it's source code) is covered under two separate licenses. 
 
@@ -41,7 +41,11 @@
 
 if ("@ARGV") {
   foreach (@ARGV) {
-    process_file($_);
+    if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
+      if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
+        process_file($_);
+      }
+    }
   }
 } else {
   
@@ -49,14 +53,22 @@
   # contents of the file.
   
   foreach (<>) {
-    process_file($_);
+     if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
+       if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
+         process_file($_);
+       }
+     }
   }
 }
 
 
 foreach $module (sort keys %require) {
   if (length($require{$module}) == 0) {
-    print "perl($module)\n";
+     if ($module =~ /^[0-9._]+$/) {
+       print "perl >= $module\n";
+     } else {
+         print "perl($module)\n";
+     }
   } else {
 
     # I am not using rpm3.0 so I do not want spaces arround my
@@ -209,7 +221,31 @@
       # will be included with the name sys/systeminfo.ph so only use the
       # basename of *.ph files
 
-      ($module  =~ m/\.ph$/) && next;
+      # ($module  =~ m/\.ph$/) && ($module =~ s!.*/!!g );
+ 
+      # there is no need to generate dependencies for ph, pl or test files
+      # so let's just skip them.
+
+      ($module =~ m/\.(ph|pl|t)$/) && next;
+
+      # skip all modules for platforms other than linux.
+
+      ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next;
+
+      # if the module name starts in a dot it is not a module name.
+
+      ($module =~ m/^\./) && next;
+
+      # if the module ends with .pm strip it to leave only basename.
+
+      $module =~ s/\.pm$//;
+
+      $module =~ s/\//::/;
+
+      # trim off trailing parenthesis if any.  Sometimes people pass
+      # the module an empty list.
+
+      $module =~ s/\(\s*\)$//;
 
       $require{$module}=$version;
       $line{$module}=$_;
--- rpm-4.1/configure.ac.wiget	Thu Aug 22 19:01:34 2002
+++ rpm-4.1/configure.ac	Wed Sep 18 23:50:46 2002
@@ -1194,6 +1194,7 @@
 AC_CONFIG_SUBDIRS(popt beecrypt zlib libelf db3)
 
 AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
+	scripts/perl.req scripts/perl.prov
 	rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
 	scripts/Makefile scripts/brp-redhat
 	scripts/macros.perl scripts/macros.php scripts/macros.python
Commit	Line	Data
	1	--- rpm-4.1/scripts/perl.req.wiget Mon Jun 3 22:56:33 2002
	2	+++ rpm-4.1/scripts/perl.req Wed Sep 18 23:50:15 2002
	3	@@ -1,4 +1,4 @@
	4	-#!/usr/bin/perl
	5	+#!@__PERL@
	6
	7	# RPM (and it's source code) is covered under two separate licenses.
	8
	9	@@ -41,7 +41,11 @@
	10
	11	if ("@ARGV") {
	12	foreach (@ARGV) {
	13	- process_file($_);
	14	+ if (m=/usr/(sbin\|bin\|lib\|share\|X11R6/(lib\|bin))/=) {
	15	+ if (! m=(/(doc\|man\|info\|usr/src)/\|\.(so\|ph\|h\|html\|pod)$)=) {
	16	+ process_file($_);
	17	+ }
	18	+ }
	19	}
	20	} else {
	21
	22	@@ -49,14 +53,22 @@
	23	# contents of the file.
	24
	25	foreach (<>) {
	26	- process_file($_);
	27	+ if (m=/usr/(sbin\|bin\|lib\|share\|X11R6/(lib\|bin))/=) {
	28	+ if (! m=(/(doc\|man\|info\|usr/src)/\|\.(so\|ph\|h\|html\|pod)$)=) {
	29	+ process_file($_);
	30	+ }
	31	+ }
	32	}
	33	}
	34
	35
	36	foreach $module (sort keys %require) {
	37	if (length($require{$module}) == 0) {
	38	- print "perl($module)\n";
	39	+ if ($module =~ /^[0-9._]+$/) {
	40	+ print "perl >= $module\n";
	41	+ } else {
	42	+ print "perl($module)\n";
	43	+ }
	44	} else {
	45
	46	# I am not using rpm3.0 so I do not want spaces arround my
	47	@@ -209,7 +221,31 @@
	48	# will be included with the name sys/systeminfo.ph so only use the
	49	# basename of *.ph files
	50
	51	- ($module =~ m/\.ph$/) && next;
	52	+ # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
	53	+
	54	+ # there is no need to generate dependencies for ph, pl or test files
	55	+ # so let's just skip them.
	56	+
	57	+ ($module =~ m/\.(ph\|pl\|t)$/) && next;
	58	+
	59	+ # skip all modules for platforms other than linux.
	60	+
	61	+ ($module =~ m/Mac\|OS2\|MSDOS\|Win32\|VMS\|vmsish/) && next;
	62	+
	63	+ # if the module name starts in a dot it is not a module name.
	64	+
	65	+ ($module =~ m/^\./) && next;
	66	+
	67	+ # if the module ends with .pm strip it to leave only basename.
	68	+
	69	+ $module =~ s/\.pm$//;
	70	+
	71	+ $module =~ s/\//::/;
	72	+
	73	+ # trim off trailing parenthesis if any. Sometimes people pass
	74	+ # the module an empty list.
	75	+
	76	+ $module =~ s/\(\s*\)$//;
	77
	78	$require{$module}=$version;
	79	$line{$module}=$_;
	80	--- rpm-4.1/configure.ac.wiget Thu Aug 22 19:01:34 2002
	81	+++ rpm-4.1/configure.ac Wed Sep 18 23:50:46 2002
	82	@@ -1194,6 +1194,7 @@
	83	AC_CONFIG_SUBDIRS(popt beecrypt zlib libelf db3)
	84
	85	AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
	86	+ scripts/perl.req scripts/perl.prov
	87	rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
	88	scripts/Makefile scripts/brp-redhat
	89	scripts/macros.perl scripts/macros.php scripts/macros.python