1 --- rpm-3.0.3/scripts/Makefile.am.wiget Sat Jun 5 22:52:30 1999
2 +++ rpm-3.0.3/scripts/Makefile.am Sat Oct 30 12:28:50 1999
6 convertrpmrc.sh find-lang.sh freshen.sh getpo.sh \
7 - perl.prov perl.req vpkg-provides.sh
8 + perl.prov perl.req find-perl-requires find-perl-provides \
11 installprefix = $(DESTDIR)
14 configdir = ${prefix}/lib/rpm
16 convertrpmrc.sh find-lang.sh freshen.sh getpo.sh \
17 - perl.prov perl.req vpkg-provides.sh
18 + perl.prov perl.req find-perl-requires find-perl-provides \
21 --- rpm-3.0.3/scripts/find-perl-provides.wiget Sat Oct 30 12:28:50 1999
22 +++ rpm-3.0.3/scripts/find-perl-provides Sat Oct 30 12:28:50 1999
27 +filelist=`sed "s/['\"]/\\\&/g"`
29 +echo $filelist|/usr/lib/rpm/find-provides
30 +/usr/lib/rpm/perl.prov $filelist
32 --- rpm-3.0.3/scripts/find-perl-requires.wiget Sat Oct 30 12:28:50 1999
33 +++ rpm-3.0.3/scripts/find-perl-requires Sat Oct 30 12:28:50 1999
38 +filelist=`sed "s/['\"]/\\\&/g"`
40 +requires="`echo $filelist|/usr/lib/rpm/find-requires`"
41 +requires_perl="`/usr/lib/rpm/perl.req $filelist`"
42 +requires_mod="`rpm -q --whatprovides --qf "%{NAME}\n" $requires_perl 2>/dev/null`"
45 +$requires_mod"| sort -u
46 --- rpm-3.0.3/macros.in.wiget Sat Oct 30 12:28:50 1999
47 +++ rpm-3.0.3/macros.in Sat Oct 30 12:28:50 1999
49 # %{perl_sitearch}/Image
50 # %dir %{perl_sitearch}/auto/Image
53 +# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros
54 +# has been moved to macros.perl (see info in this file for details).
56 %requires_eq() %(LC_ALL="C" rpm -q --queryformat 'Requires:%%{NAME} = %%{VERSION}' %1| grep -v "is not")
57 -%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
58 -%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
59 --- rpm-3.0.3/macros.perl.in.wiget Sat Oct 30 12:28:50 1999
60 +++ rpm-3.0.3/macros.perl.in Sat Oct 30 12:28:50 1999
62 +# Perl specific macro definitions.
63 +# To make use of these macros insert the following line into your spec file:
64 +# %include @RPMCONFIGDIR@/macros.perl
66 +%define __find_requires @RPMCONFIGDIR@/find-perl-requires
67 +%define __find_provides @RPMCONFIGDIR@/find-perl-provides
69 +%define perl_sitelib %(eval "`perl -V:installsitelib`"; echo $installsitelib)
70 +%define perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
71 +%define perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
73 --- rpm-3.0.3/configure.in.wiget Sat Oct 30 13:17:49 1999
74 +++ rpm-3.0.3/configure.in Sat Oct 30 13:18:52 1999
76 AC_MSG_RESULT(patch later then 2.2 found)
79 + AC_PATH_PROG(PERL, perl, /usr/bin/perl, $MYPATH)
80 AC_PATH_PROG(PGPBIN, pgp, /usr/bin/pgp, $MYPATH)
81 AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
82 AC_PATH_PROG(__TAR, tar, /bin/tar, $MYPATH)
84 export LIBS INCPATH CONFIG_SITE
86 AC_CONFIG_SUBDIRS(popt)
87 -AC_OUTPUT([Makefile rpmrc macros macros.pld lib/Makefile
88 - build/Makefile tools/Makefile scripts/Makefile
89 +AC_OUTPUT([Makefile rpmrc macros macros.pld macros.perl lib/Makefile
90 + build/Makefile tools/Makefile
91 + scripts/Makefile scripts/perl.req scripts/perl.prov
92 tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
93 misc/Makefile po/Makefile.in intl/Makefile
94 doc/Makefile doc/manual/Makefile doc/pl/Makefile doc/ru/Makefile
95 --- rpm-3.0.3/scripts/perl.req.pius Sat Jun 5 22:52:31 1999
96 +++ rpm-3.0.3/scripts/perl.req Sun Dec 5 02:38:42 1999
101 # a simple makedepends like script for perl.
108 + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
109 + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
117 # contents of the file.
121 + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
122 + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
130 foreach $module (sort keys %require) {
131 if (length($require{$module}) == 0) {
132 - print "perl($module)\n";
133 + if ($module =~ /^[0-9._]+$/) {
134 + print "perl >= $module\n";
136 + print "perl($module)\n";
140 - print "perl($module)>=$require{$module}\n";
142 - # we need to print it without the version number until the
143 - # requires syntax accepts version numbers correctly.
145 - print "perl($module)\n";
146 + print "perl($module) >= $require{$module}\n";
153 open(FILE, "<$file")||
154 - die("Could not open file: '$file' : $!\n");
155 + die("$0: Could not open file: '$file' : $!\n");
159 # skip the documentation
160 - if ( (m/^=(head1|head2|pod)/) .. (m/^=(cut)/) ) {
161 + if ( (m/^=(head1|head2|pod|item)/) .. (m/^=(cut)/) ) {
165 + if ( (m/^=(over)/) .. (m/^=(back)/) ) {
169 @@ -108,13 +118,40 @@
170 # will be included with the name sys/systeminfo.ph so only use the
171 # basename of *.ph files
173 - ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
174 + # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
176 + # there is no need to generate dependencies for ph, pl or test files
177 + # so let's just skip them.
179 + ($module =~ m/\.(ph|pl|t)$/) && next;
181 + # skip all modules for platforms other than linux.
183 + ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next;
185 + # if the module name starts in a dot it is not a module name.
187 + ($module =~ m/^\./) && next;
189 + # if the module ends with .pm strip it to leave only basename.
191 + $module =~ s/\.pm$//;
193 + $module =~ s/\//::/;
195 + # trim off trailing parenthesis if any. Sometimes people pass
196 + # the module an empty list.
198 + $module =~ s/\(\s*\)$//;
200 $require{$module}=$version;
208 + die("$0: Could not close file: '$file' : $!\n");
212 --- rpm-3.0.3/scripts/perl.prov.pius Sat Jun 5 22:52:31 1999
213 +++ rpm-3.0.3/scripts/perl.prov Sun Dec 5 02:31:33 1999
218 # a simple script to print the proper name for perl libraries.
225 + if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) {
232 # contents of the file.
236 + if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) {
243 if (length($require{$module}) == 0) {
244 print "perl($module)\n";
246 - print "perl($module)=$require{$module}\n";
248 - # we need to print it without the version number until the
249 - # requires syntax accepts version numbers correctly.
251 - print "perl($module)\n";
252 + print "perl($module) = $require{$module}\n";
259 open(FILE, "<$file")||
260 - die("Could not open file: '$file' : $!\n");
261 + die("$0: Could not open file: '$file' : $!\n");
263 my ($package, $version) = ();
267 # skip the documentation
268 - if ( (m/^=(head1|head2|pod)/) .. (m/^=(cut)/) ) {
269 + if ( (m/^=(head1|head2|pod|item)/) .. (m/^=(cut)/) ) {
273 + if ( (m/^=(over)/) .. (m/^=(back)/) ) {
281 - (m/^\s*\$VERSION\s+=\s+/)
282 + (m/^\s*\$VERSION\s*=\s+/)
285 # first see if the version string contains the string
292 + die("$0: Could not close file: '$file' : $!\n");