]>
Commit | Line | Data |
---|---|---|
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 | |
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 | |
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 | |
15 | @@ -1,4 +1,4 @@ | |
16 | -#!/usr/bin/perl | |
17 | +#!@__PERL@ | |
18 | ||
19 | # RPM (and it's source code) is covered under two separate licenses. | |
20 | ||
21 | @@ -41,7 +41,11 @@ | |
22 | ||
23 | if ("@ARGV") { | |
24 | foreach (@ARGV) { | |
25 | - process_file($_); | |
26 | + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) { | |
27 | + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { | |
28 | + process_file($_); | |
29 | + } | |
30 | + } | |
31 | } | |
32 | } else { | |
33 | ||
34 | @@ -49,14 +53,22 @@ | |
35 | # contents of the file. | |
36 | ||
37 | foreach (<>) { | |
38 | - process_file($_); | |
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 | + } | |
44 | } | |
45 | } | |
46 | ||
47 | ||
48 | foreach $module (sort keys %require) { | |
49 | if (length($require{$module}) == 0) { | |
50 | - print "perl($module)\n"; | |
51 | + if ($module =~ /^[0-9._]+$/) { | |
52 | + print "perl >= $module\n"; | |
53 | + } else { | |
54 | + print "perl($module)\n"; | |
55 | + } | |
56 | } else { | |
57 | ||
58 | # I am not using rpm3.0 so I do not want spaces arround my | |
59 | @@ -219,7 +231,31 @@ | |
60 | # will be included with the name sys/systeminfo.ph so only use the | |
61 | # basename of *.ph files | |
62 | ||
63 | - ($module =~ m/\.ph$/) && next; | |
64 | + # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g ); | |
65 | + | |
66 | + # there is no need to generate dependencies for ph, pl or test files | |
67 | + # so let's just skip them. | |
68 | + | |
69 | + ($module =~ m/\.(ph|pl|t)$/) && next; | |
70 | + | |
71 | + # skip all modules for platforms other than linux. | |
72 | + | |
73 | + ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next; | |
74 | + | |
75 | + # if the module name starts in a dot it is not a module name. | |
76 | + | |
77 | + ($module =~ m/^\./) && next; | |
78 | + | |
79 | + # if the module ends with .pm strip it to leave only basename. | |
80 | + | |
81 | + $module =~ s/\.pm$//; | |
82 | + | |
83 | + $module =~ s/\//::/; | |
84 | + | |
85 | + # trim off trailing parenthesis if any. Sometimes people pass | |
86 | + # the module an empty list. | |
87 | + | |
88 | + $module =~ s/\(\s*\)$//; | |
89 | ||
90 | $require{$module}=$version; | |
91 | $line{$module}=$_; |