1 --- rpm-3.0.3.perl/configure.in Fri Oct 22 14:23:17 1999
2 +++ rpm-3.0.3/configure.in Fri Oct 22 14:47:01 1999
4 export LIBS INCPATH CONFIG_SITE
6 AC_CONFIG_SUBDIRS(popt)
7 -AC_OUTPUT([Makefile rpmrc macros macros.pld lib/Makefile
8 +AC_OUTPUT([Makefile rpmrc macros macros.pld macros.perl lib/Makefile
9 build/Makefile tools/Makefile scripts/Makefile
10 tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
11 misc/Makefile po/Makefile.in intl/Makefile
12 --- rpm-3.0.3.perl/macros.in Fri Oct 22 14:23:17 1999
13 +++ rpm-3.0.3/macros.in Fri Oct 22 14:59:08 1999
15 # %{perl_sitearch}/Image
16 # %dir %{perl_sitearch}/auto/Image
19 +# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros
20 +# has been moved to macros.perl (see info in this file for details).
22 %requires_eq() %(LC_ALL="C" rpm -q --queryformat 'Requires:%%{NAME} = %%{VERSION}' %1| grep -v "is not")
23 -%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
24 -%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
25 --- rpm-3.0.3.perl/macros.perl.in Thu Jan 1 01:00:00 1970
26 +++ rpm-3.0.3/macros.perl.in Fri Oct 22 15:08:15 1999
28 +# Perl specific macro definitions.
29 +# To make use of these macros insert the following line into your spec file:
30 +# %include @RPMCONFIGDIR@/macros.perl
32 +%define __find_requires @RPMCONFIGDIR@/find-perl-requires
33 +%define __find_provides @RPMCONFIGDIR@/find-perl-provides
35 +%define perl_sitelib %(eval "`perl -V:installsitelib`"; echo $installsitelib)
36 +%define perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
37 +%define perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
39 --- rpm-3.0.3.perl/scripts/Makefile.am Sat Jun 5 22:52:30 1999
40 +++ rpm-3.0.3/scripts/Makefile.am Fri Oct 22 15:12:12 1999
44 convertrpmrc.sh find-lang.sh freshen.sh getpo.sh \
45 - perl.prov perl.req vpkg-provides.sh
46 + perl.prov perl.req find-perl-requires find-perl-provides \
49 installprefix = $(DESTDIR)
52 configdir = ${prefix}/lib/rpm
54 convertrpmrc.sh find-lang.sh freshen.sh getpo.sh \
55 - perl.prov perl.req vpkg-provides.sh
56 + perl.prov perl.req find-perl-requires find-perl-provides \
59 --- rpm-3.0.3.perl/scripts/find-perl-provides Thu Jan 1 01:00:00 1970
60 +++ rpm-3.0.3/scripts/find-perl-provides Fri Oct 22 12:21:39 1999
65 +filelist=`sed "s/['\"]/\\\&/g"`
67 +echo $filelist|/usr/lib/rpm/find-provides
68 +/usr/lib/rpm/perl.prov $filelist
70 --- rpm-3.0.3.perl/scripts/find-perl-requires Thu Jan 1 01:00:00 1970
71 +++ rpm-3.0.3/scripts/find-perl-requires Fri Oct 22 12:21:36 1999
76 +filelist=`sed "s/['\"]/\\\&/g"`
78 +requires="`echo $filelist|/usr/lib/rpm/find-requires`"
79 +requires_perl="`/usr/lib/rpm/perl.req $filelist`"
80 +requires_mod="`rpm -q --whatprovides --qf "%{NAME}\n" $requires_perl 2>/dev/null`"
83 +$requires_mod"| sort -u
84 --- rpm-3.0.3.perl/scripts/perl.prov Sat Jun 5 22:52:31 1999
85 +++ rpm-3.0.3/scripts/perl.prov Fri Oct 22 14:34:50 1999
89 foreach $module (sort keys %require) {
90 + ($mod = $module) =~ s/::/-/g;
91 if (length($require{$module}) == 0) {
92 - print "perl($module)\n";
93 + print "perl($mod)\n";
95 - print "perl($module)=$require{$module}\n";
96 + print "perl($mod) = $require{$module}\n";
98 # we need to print it without the version number until the
99 # requires syntax accepts version numbers correctly.
101 - print "perl($module)\n";
102 +# print "perl($module)\n";
106 --- rpm-3.0.3.perl/scripts/perl.req Sat Jun 5 22:52:31 1999
107 +++ rpm-3.0.3/scripts/perl.req Fri Oct 22 12:21:33 1999
111 foreach $module (sort keys %require) {
112 + $module =~ s/::/-/g;
113 if (length($require{$module}) == 0) {
114 - print "perl($module)\n";
115 + if ($module =~ /^[0-9._]+$/) {
116 + print "perl >= $module\n";
118 + print "perl($module)\n";
122 - print "perl($module)>=$require{$module}\n";
123 + print "perl($module) >= $require{$module}\n";
125 # we need to print it without the version number until the
126 # requires syntax accepts version numbers correctly.
128 - print "perl($module)\n";
129 +# print "perl($module)\n";