1 diff -ruN rpm-3.0.3/macros.in rpm-3.0.3.new/macros.in
2 --- rpm-3.0.3/macros.in Sat Oct 30 11:59:36 1999
3 +++ rpm-3.0.3.new/macros.in Sat Oct 30 11:24:39 1999
5 # %{perl_sitearch}/Image
6 # %dir %{perl_sitearch}/auto/Image
9 +# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros
10 +# has been moved to macros.perl (see info in this file for details).
12 %requires_eq() %(LC_ALL="C" rpm -q --queryformat 'Requires:%%{NAME} = %%{VERSION}' %1| grep -v "is not")
13 -%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
14 -%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
15 diff -ruN rpm-3.0.3/macros.perl.in rpm-3.0.3.new/macros.perl.in
16 --- rpm-3.0.3/macros.perl.in Thu Jan 1 01:00:00 1970
17 +++ rpm-3.0.3.new/macros.perl.in Sat Oct 30 11:24:39 1999
19 +# Perl specific macro definitions.
20 +# To make use of these macros insert the following line into your spec file:
21 +# %include @RPMCONFIGDIR@/macros.perl
23 +%define __find_requires @RPMCONFIGDIR@/find-perl-requires
24 +%define __find_provides @RPMCONFIGDIR@/find-perl-provides
26 +%define perl_sitelib %(eval "`perl -V:installsitelib`"; echo $installsitelib)
27 +%define perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
28 +%define perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
30 diff -ruN rpm-3.0.3/scripts/Makefile.am rpm-3.0.3.new/scripts/Makefile.am
31 --- rpm-3.0.3/scripts/Makefile.am Sat Jun 5 22:52:30 1999
32 +++ rpm-3.0.3.new/scripts/Makefile.am Sat Oct 30 11:24:39 1999
36 convertrpmrc.sh find-lang.sh freshen.sh getpo.sh \
37 - perl.prov perl.req vpkg-provides.sh
38 + perl.prov perl.req find-perl-requires find-perl-provides \
41 installprefix = $(DESTDIR)
44 configdir = ${prefix}/lib/rpm
46 convertrpmrc.sh find-lang.sh freshen.sh getpo.sh \
47 - perl.prov perl.req vpkg-provides.sh
48 + perl.prov perl.req find-perl-requires find-perl-provides \
51 diff -ruN rpm-3.0.3/scripts/find-perl-provides rpm-3.0.3.new/scripts/find-perl-provides
52 --- rpm-3.0.3/scripts/find-perl-provides Thu Jan 1 01:00:00 1970
53 +++ rpm-3.0.3.new/scripts/find-perl-provides Sat Oct 30 11:24:39 1999
58 +filelist=`sed "s/['\"]/\\\&/g"`
60 +echo $filelist|/usr/lib/rpm/find-provides
61 +/usr/lib/rpm/perl.prov $filelist
63 diff -ruN rpm-3.0.3/scripts/find-perl-requires rpm-3.0.3.new/scripts/find-perl-requires
64 --- rpm-3.0.3/scripts/find-perl-requires Thu Jan 1 01:00:00 1970
65 +++ rpm-3.0.3.new/scripts/find-perl-requires Sat Oct 30 11:24:39 1999
70 +filelist=`sed "s/['\"]/\\\&/g"`
72 +requires="`echo $filelist|/usr/lib/rpm/find-requires`"
73 +requires_perl="`/usr/lib/rpm/perl.req $filelist`"
74 +requires_mod="`rpm -q --whatprovides --qf "%{NAME}\n" $requires_perl 2>/dev/null`"
77 +$requires_mod"| sort -u
78 diff -ruN rpm-3.0.3/scripts/perl.prov rpm-3.0.3.new/scripts/perl.prov
79 --- rpm-3.0.3/scripts/perl.prov Sat Jun 5 22:52:31 1999
80 +++ rpm-3.0.3.new/scripts/perl.prov Sat Oct 30 11:24:39 1999
85 # a simple script to print the proper name for perl libraries.
88 if (length($require{$module}) == 0) {
89 print "perl($module)\n";
91 - print "perl($module)=$require{$module}\n";
92 + print "perl($module) = $require{$module}\n";
94 # we need to print it without the version number until the
95 # requires syntax accepts version numbers correctly.
97 - print "perl($module)\n";
98 +# print "perl($module)\n";
102 diff -ruN rpm-3.0.3/scripts/perl.req rpm-3.0.3.new/scripts/perl.req
103 --- rpm-3.0.3/scripts/perl.req Sat Jun 5 22:52:31 1999
104 +++ rpm-3.0.3.new/scripts/perl.req Sat Oct 30 11:50:03 1999
109 # a simple makedepends like script for perl.
116 + if (m=/usr/(bin|lib|share|X11R6/(lib|bin))/=) {
117 + if (! m=(/((doc|man|info)|/usr/src)/)\.so$)=) {
125 # contents of the file.
129 + if (m=/usr/(bin|lib|share|X11R6/(lib|bin))/=) {
130 + if (! m=(/((doc|man|info)|/usr/src)/)\.so$)=) {
138 foreach $module (sort keys %require) {
139 if (length($require{$module}) == 0) {
140 - print "perl($module)\n";
141 + if ($module =~ /^[0-9._]+$/) {
142 + print "perl >= $module\n";
144 + print "perl($module)\n";
148 - print "perl($module)>=$require{$module}\n";
149 + print "perl($module) >= $require{$module}\n";
151 # we need to print it without the version number until the
152 # requires syntax accepts version numbers correctly.
154 - print "perl($module)\n";
155 +# print "perl($module)\n";
162 # skip the documentation
163 - if ( (m/^=(head1|head2|pod)/) .. (m/^=(cut)/) ) {
164 + if ( (m/^=(head1|head2|pod|item)/) .. (m/^=(cut)/) ) {