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