]>
Commit | Line | Data |
---|---|---|
5b0f0ac9 MM |
1 | --- rpm-4.1/scripts/Makefile.am.wiget Thu Aug 22 19:31:42 2002 |
2 | +++ rpm-4.1/scripts/Makefile.am Wed Sep 18 23:52:19 2002 | |
3 | @@ -31,4 +31,5 @@ | |
1e537e49 | 4 | magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi \ |
5b0f0ac9 MM |
5 | rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \ |
6 | sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \ | |
7 | + find-perl-requires find-perl-provides \ | |
8 | vpkg-provides.sh vpkg-provides2.sh | |
9 | --- rpm-4.1/scripts/perl.prov.wiget Fri Feb 1 16:20:26 2002 | |
10 | +++ rpm-4.1/scripts/perl.prov Wed Sep 18 23:50:15 2002 | |
003cac49 JR |
11 | @@ -47,7 +47,9 @@ |
12 | ||
13 | if ("@ARGV") { | |
14 | foreach (@ARGV) { | |
15 | - process_file($_); | |
16 | + if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) { | |
17 | + process_file($_); | |
18 | + } | |
19 | } | |
20 | } else { | |
21 | ||
22 | @@ -55,7 +57,9 @@ | |
23 | # contents of the file. | |
24 | ||
25 | foreach (<>) { | |
26 | - process_file($_); | |
27 | + if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) { | |
28 | + process_file($_); | |
29 | + } | |
30 | } | |
31 | } | |
32 | ||
5b0f0ac9 MM |
33 | --- rpm-4.1/scripts/perl.req.wiget Mon Jun 3 22:56:33 2002 |
34 | +++ rpm-4.1/scripts/perl.req Wed Sep 18 23:50:15 2002 | |
2fa5aec3 AF |
35 | @@ -1,4 +1,4 @@ |
36 | -#!/usr/bin/perl | |
5b0f0ac9 | 37 | +#!@__PERL@ |
4703c2f4 AF |
38 | |
39 | # RPM (and it's source code) is covered under two separate licenses. | |
40 | ||
41 | @@ -41,7 +41,11 @@ | |
2fa5aec3 AF |
42 | |
43 | if ("@ARGV") { | |
44 | foreach (@ARGV) { | |
45 | - process_file($_); | |
20a6d548 | 46 | + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) { |
2eb651d8 | 47 | + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { |
2fa5aec3 AF |
48 | + process_file($_); |
49 | + } | |
50 | + } | |
51 | } | |
52 | } else { | |
53 | ||
4703c2f4 | 54 | @@ -49,14 +53,22 @@ |
2fa5aec3 AF |
55 | # contents of the file. |
56 | ||
57 | foreach (<>) { | |
58 | - process_file($_); | |
4703c2f4 AF |
59 | + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) { |
60 | + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { | |
61 | + process_file($_); | |
62 | + } | |
63 | + } | |
2fa5aec3 AF |
64 | } |
65 | } | |
edf87823 | 66 | |
67 | ||
68 | foreach $module (sort keys %require) { | |
edf87823 | 69 | if (length($require{$module}) == 0) { |
70 | - print "perl($module)\n"; | |
4703c2f4 AF |
71 | + if ($module =~ /^[0-9._]+$/) { |
72 | + print "perl >= $module\n"; | |
73 | + } else { | |
74 | + print "perl($module)\n"; | |
75 | + } | |
edf87823 | 76 | } else { |
2fa5aec3 | 77 | |
4703c2f4 | 78 | # I am not using rpm3.0 so I do not want spaces arround my |
5b0f0ac9 | 79 | @@ -209,7 +221,31 @@ |
3ce8984f | 80 | # will be included with the name sys/systeminfo.ph so only use the |
81 | # basename of *.ph files | |
82 | ||
5b0f0ac9 | 83 | - ($module =~ m/\.ph$/) && next; |
3ce8984f | 84 | + # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g ); |
5b0f0ac9 | 85 | + |
852c3a98 | 86 | + # there is no need to generate dependencies for ph, pl or test files |
4a19987c | 87 | + # so let's just skip them. |
4703c2f4 | 88 | + |
852c3a98 | 89 | + ($module =~ m/\.(ph|pl|t)$/) && next; |
cfd811fa | 90 | + |
4a19987c | 91 | + # skip all modules for platforms other than linux. |
92b19143 | 92 | + |
93 | + ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next; | |
94 | + | |
4a19987c | 95 | + # if the module name starts in a dot it is not a module name. |
4d8fb4e3 | 96 | + |
97 | + ($module =~ m/^\./) && next; | |
98 | + | |
4a19987c | 99 | + # if the module ends with .pm strip it to leave only basename. |
5e855029 | 100 | + |
4a19987c | 101 | + $module =~ s/\.pm$//; |
5e855029 | 102 | + |
cb87a980 | 103 | + $module =~ s/\//::/; |
104 | + | |
4a19987c | 105 | + # trim off trailing parenthesis if any. Sometimes people pass |
106 | + # the module an empty list. | |
107 | + | |
108 | + $module =~ s/\(\s*\)$//; | |
cfd811fa | 109 | |
3ce8984f | 110 | $require{$module}=$version; |
5b0f0ac9 MM |
111 | $line{$module}=$_; |
112 | --- rpm-4.1/configure.ac.wiget Thu Aug 22 19:01:34 2002 | |
113 | +++ rpm-4.1/configure.ac Wed Sep 18 23:50:46 2002 | |
114 | @@ -1194,6 +1194,7 @@ | |
115 | AC_CONFIG_SUBDIRS(popt beecrypt zlib libelf db3) | |
116 | ||
117 | AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec | |
118 | + macros.perl scripts/perl.req scripts/perl.prov | |
119 | rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile | |
120 | scripts/Makefile scripts/brp-redhat | |
121 | scripts/macros.perl scripts/macros.php scripts/macros.python | |
122 | --- rpm-4.1/macros.in.wiget Sun Sep 1 00:30:19 2002 | |
123 | +++ rpm-4.1/macros.in Wed Sep 18 23:50:46 2002 | |
124 | @@ -1012,8 +1012,10 @@ | |
9884a1b5 AF |
125 | # %dir %{perl_sitearch}/auto/Image |
126 | # | |
5b0f0ac9 MM |
127 | %requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") |
128 | -%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch) | |
129 | -%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib) | |
9884a1b5 AF |
130 | +# |
131 | +# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros | |
132 | +# has been moved to macros.perl (see info in this file for details). | |
133 | +# | |
9884a1b5 AF |
134 | |
135 | #------------------------------------------------------------------------------ | |
136 | # arch macro for all Intel i?86 compatibile processors |