]>
Commit | Line | Data |
---|---|---|
5b0f0ac9 MM |
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 | |
2fa5aec3 AF |
3 | @@ -1,4 +1,4 @@ |
4 | -#!/usr/bin/perl | |
5b0f0ac9 | 5 | +#!@__PERL@ |
4703c2f4 AF |
6 | |
7 | # RPM (and it's source code) is covered under two separate licenses. | |
8 | ||
9 | @@ -41,7 +41,11 @@ | |
2fa5aec3 AF |
10 | |
11 | if ("@ARGV") { | |
12 | foreach (@ARGV) { | |
13 | - process_file($_); | |
20a6d548 | 14 | + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) { |
2eb651d8 | 15 | + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { |
2fa5aec3 AF |
16 | + process_file($_); |
17 | + } | |
18 | + } | |
19 | } | |
20 | } else { | |
21 | ||
4703c2f4 | 22 | @@ -49,14 +53,22 @@ |
2fa5aec3 AF |
23 | # contents of the file. |
24 | ||
25 | foreach (<>) { | |
26 | - process_file($_); | |
4703c2f4 AF |
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 | + } | |
2fa5aec3 AF |
32 | } |
33 | } | |
edf87823 | 34 | |
35 | ||
36 | foreach $module (sort keys %require) { | |
edf87823 | 37 | if (length($require{$module}) == 0) { |
38 | - print "perl($module)\n"; | |
4703c2f4 AF |
39 | + if ($module =~ /^[0-9._]+$/) { |
40 | + print "perl >= $module\n"; | |
41 | + } else { | |
42 | + print "perl($module)\n"; | |
43 | + } | |
edf87823 | 44 | } else { |
2fa5aec3 | 45 | |
4703c2f4 | 46 | # I am not using rpm3.0 so I do not want spaces arround my |
5b0f0ac9 | 47 | @@ -209,7 +221,31 @@ |
3ce8984f | 48 | # will be included with the name sys/systeminfo.ph so only use the |
49 | # basename of *.ph files | |
50 | ||
5b0f0ac9 | 51 | - ($module =~ m/\.ph$/) && next; |
3ce8984f | 52 | + # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g ); |
5b0f0ac9 | 53 | + |
852c3a98 | 54 | + # there is no need to generate dependencies for ph, pl or test files |
4a19987c | 55 | + # so let's just skip them. |
4703c2f4 | 56 | + |
852c3a98 | 57 | + ($module =~ m/\.(ph|pl|t)$/) && next; |
cfd811fa | 58 | + |
4a19987c | 59 | + # skip all modules for platforms other than linux. |
92b19143 | 60 | + |
61 | + ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next; | |
62 | + | |
4a19987c | 63 | + # if the module name starts in a dot it is not a module name. |
4d8fb4e3 | 64 | + |
65 | + ($module =~ m/^\./) && next; | |
66 | + | |
4a19987c | 67 | + # if the module ends with .pm strip it to leave only basename. |
5e855029 | 68 | + |
4a19987c | 69 | + $module =~ s/\.pm$//; |
5e855029 | 70 | + |
cb87a980 | 71 | + $module =~ s/\//::/; |
72 | + | |
4a19987c | 73 | + # trim off trailing parenthesis if any. Sometimes people pass |
74 | + # the module an empty list. | |
75 | + | |
76 | + $module =~ s/\(\s*\)$//; | |
cfd811fa | 77 | |
3ce8984f | 78 | $require{$module}=$version; |
5b0f0ac9 MM |
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 | |
ff5da8bf | 86 | + scripts/perl.req scripts/perl.prov |
5b0f0ac9 MM |
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 |