]>
Commit | Line | Data |
---|---|---|
1 | --- rpm-4.0/scripts/Makefile.am.wiget Wed Jul 5 14:26:37 2000 | |
2 | +++ rpm-4.0/scripts/Makefile.am Wed Nov 15 21:31:03 2000 | |
3 | @@ -8,7 +8,8 @@ | |
4 | find-prov.pl find-req.pl cpanflute find-provides.perl \ | |
5 | find-requires.perl get_magic.pl getpo.sh http.req \ | |
6 | magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \ | |
7 | - vpkg-provides.sh vpkg-provides2.sh | |
8 | + vpkg-provides.sh vpkg-provides2.sh \ | |
9 | + find-perl-requires find-perl-provides | |
10 | ||
11 | installprefix = $(DESTDIR) | |
12 | ||
13 | @@ -21,4 +22,5 @@ | |
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 \ | |
17 | - vpkg-provides.sh vpkg-provides2.sh | |
18 | + vpkg-provides.sh vpkg-provides2.sh \ | |
19 | + find-perl-requires find-perl-provides | |
20 | --- rpm-4.0/scripts/perl.prov.wiget Mon Jan 17 19:58:36 2000 | |
21 | +++ rpm-4.0/scripts/perl.prov Wed Nov 15 21:31:03 2000 | |
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 | ||
44 | --- rpm-4.0/scripts/perl.req.wiget Mon Jan 17 19:58:36 2000 | |
45 | +++ rpm-4.0/scripts/perl.req Wed Nov 15 21:31:03 2000 | |
46 | @@ -1,4 +1,4 @@ | |
47 | -#!/usr/bin/perl | |
48 | +#!@PERL@ | |
49 | ||
50 | # RPM (and it's source code) is covered under two separate licenses. | |
51 | ||
52 | @@ -41,7 +41,11 @@ | |
53 | ||
54 | if ("@ARGV") { | |
55 | foreach (@ARGV) { | |
56 | - process_file($_); | |
57 | + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) { | |
58 | + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { | |
59 | + process_file($_); | |
60 | + } | |
61 | + } | |
62 | } | |
63 | } else { | |
64 | ||
65 | @@ -49,14 +53,22 @@ | |
66 | # contents of the file. | |
67 | ||
68 | foreach (<>) { | |
69 | - process_file($_); | |
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 | + } | |
75 | } | |
76 | } | |
77 | ||
78 | ||
79 | foreach $module (sort keys %require) { | |
80 | if (length($require{$module}) == 0) { | |
81 | - print "perl($module)\n"; | |
82 | + if ($module =~ /^[0-9._]+$/) { | |
83 | + print "perl >= $module\n"; | |
84 | + } else { | |
85 | + print "perl($module)\n"; | |
86 | + } | |
87 | } else { | |
88 | ||
89 | # I am not using rpm3.0 so I do not want spaces arround my | |
90 | @@ -183,7 +195,31 @@ | |
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 ); | |
96 | + | |
97 | + # there is no need to generate dependencies for ph, pl or test files | |
98 | + # so let's just skip them. | |
99 | + | |
100 | + ($module =~ m/\.(ph|pl|t)$/) && next; | |
101 | + | |
102 | + # skip all modules for platforms other than linux. | |
103 | + | |
104 | + ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next; | |
105 | + | |
106 | + # if the module name starts in a dot it is not a module name. | |
107 | + | |
108 | + ($module =~ m/^\./) && next; | |
109 | + | |
110 | + # if the module ends with .pm strip it to leave only basename. | |
111 | + | |
112 | + $module =~ s/\.pm$//; | |
113 | + | |
114 | + $module =~ s/\//::/; | |
115 | + | |
116 | + # trim off trailing parenthesis if any. Sometimes people pass | |
117 | + # the module an empty list. | |
118 | + | |
119 | + $module =~ s/\(\s*\)$//; | |
120 | ||
121 | ||
122 | $require{$module}=$version; | |
123 | --- rpm-4.0/configure.in.wiget Wed Nov 15 21:31:03 2000 | |
124 | +++ rpm-4.0/configure.in Wed Nov 15 21:34:55 2000 | |
125 | @@ -181,6 +181,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 | @@ -952,6 +953,7 @@ | |
134 | ||
135 | AC_CONFIG_SUBDIRS(popt) | |
136 | AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt 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/macros.in.wiget Wed Nov 15 21:31:03 2000 | |
142 | +++ rpm-4.0/macros.in Wed Nov 15 21:31:03 2000 | |
143 | @@ -623,9 +623,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 |