]>
Commit | Line | Data |
---|---|---|
49deaedf AM |
1 | diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac |
2 | --- rpm-4.3.org/configure.ac 2004-01-07 01:51:35.251160244 +0100 | |
3 | +++ rpm-4.3/configure.ac 2004-01-07 01:55:53.198560246 +0100 | |
dafd24dd AM |
4 | @@ -1313,6 +1313,7 @@ |
5 | Doxyfile Makefile macros rpmpopt rpm.spec | |
6 | rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile | |
7 | scripts/Makefile scripts/macros.perl scripts/macros.php | |
8 | + scripts/perl.req scripts/perl.prov | |
9 | scripts/macros.python tools/Makefile misc/Makefile doc/Makefile | |
10 | doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile | |
11 | doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile | |
49deaedf AM |
12 | diff -urN rpm-4.3.org/scripts/perl.req rpm-4.3/scripts/perl.req |
13 | --- rpm-4.3.org/scripts/perl.req 2004-01-07 01:51:04.911464416 +0100 | |
14 | +++ rpm-4.3/scripts/perl.req 2004-01-07 01:55:17.030076058 +0100 | |
2fa5aec3 AF |
15 | @@ -1,4 +1,4 @@ |
16 | -#!/usr/bin/perl | |
5b0f0ac9 | 17 | +#!@__PERL@ |
4703c2f4 AF |
18 | |
19 | # RPM (and it's source code) is covered under two separate licenses. | |
20 | ||
21 | @@ -41,7 +41,11 @@ | |
2fa5aec3 AF |
22 | |
23 | if ("@ARGV") { | |
24 | foreach (@ARGV) { | |
25 | - process_file($_); | |
20a6d548 | 26 | + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) { |
2eb651d8 | 27 | + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { |
2fa5aec3 AF |
28 | + process_file($_); |
29 | + } | |
30 | + } | |
31 | } | |
32 | } else { | |
33 | ||
4703c2f4 | 34 | @@ -49,14 +53,22 @@ |
2fa5aec3 AF |
35 | # contents of the file. |
36 | ||
37 | foreach (<>) { | |
38 | - process_file($_); | |
4703c2f4 AF |
39 | + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) { |
40 | + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { | |
41 | + process_file($_); | |
42 | + } | |
43 | + } | |
2fa5aec3 AF |
44 | } |
45 | } | |
edf87823 | 46 | |
47 | ||
48 | foreach $module (sort keys %require) { | |
edf87823 | 49 | if (length($require{$module}) == 0) { |
50 | - print "perl($module)\n"; | |
4703c2f4 AF |
51 | + if ($module =~ /^[0-9._]+$/) { |
52 | + print "perl >= $module\n"; | |
53 | + } else { | |
54 | + print "perl($module)\n"; | |
55 | + } | |
edf87823 | 56 | } else { |
2fa5aec3 | 57 | |
4703c2f4 | 58 | # I am not using rpm3.0 so I do not want spaces arround my |
49deaedf | 59 | @@ -219,7 +231,31 @@ |
3ce8984f | 60 | # will be included with the name sys/systeminfo.ph so only use the |
61 | # basename of *.ph files | |
62 | ||
5b0f0ac9 | 63 | - ($module =~ m/\.ph$/) && next; |
3ce8984f | 64 | + # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g ); |
5b0f0ac9 | 65 | + |
852c3a98 | 66 | + # there is no need to generate dependencies for ph, pl or test files |
4a19987c | 67 | + # so let's just skip them. |
4703c2f4 | 68 | + |
852c3a98 | 69 | + ($module =~ m/\.(ph|pl|t)$/) && next; |
cfd811fa | 70 | + |
4a19987c | 71 | + # skip all modules for platforms other than linux. |
92b19143 | 72 | + |
73 | + ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next; | |
74 | + | |
4a19987c | 75 | + # if the module name starts in a dot it is not a module name. |
4d8fb4e3 | 76 | + |
77 | + ($module =~ m/^\./) && next; | |
78 | + | |
4a19987c | 79 | + # if the module ends with .pm strip it to leave only basename. |
5e855029 | 80 | + |
4a19987c | 81 | + $module =~ s/\.pm$//; |
5e855029 | 82 | + |
cb87a980 | 83 | + $module =~ s/\//::/; |
84 | + | |
4a19987c | 85 | + # trim off trailing parenthesis if any. Sometimes people pass |
86 | + # the module an empty list. | |
87 | + | |
88 | + $module =~ s/\(\s*\)$//; | |
cfd811fa | 89 | |
3ce8984f | 90 | $require{$module}=$version; |
5b0f0ac9 | 91 | $line{$module}=$_; |