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/scripts/perl.prov.wiget Sat Jun 5 22:52:31 1999
47 +++ rpm-3.0.3/scripts/perl.prov Sat Oct 30 12:28:50 1999
52 # a simple script to print the proper name for perl libraries.
55 if (length($require{$module}) == 0) {
56 print "perl($module)\n";
58 - print "perl($module)=$require{$module}\n";
59 + print "perl($module) = $require{$module}\n";
61 # we need to print it without the version number until the
62 # requires syntax accepts version numbers correctly.
64 - print "perl($module)\n";
65 +# print "perl($module)\n";
69 --- rpm-3.0.3/macros.in.wiget Sat Oct 30 12:28:50 1999
70 +++ rpm-3.0.3/macros.in Sat Oct 30 12:28:50 1999
72 # %{perl_sitearch}/Image
73 # %dir %{perl_sitearch}/auto/Image
76 +# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros
77 +# has been moved to macros.perl (see info in this file for details).
79 %requires_eq() %(LC_ALL="C" rpm -q --queryformat 'Requires:%%{NAME} = %%{VERSION}' %1| grep -v "is not")
80 -%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
81 -%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
82 --- rpm-3.0.3/macros.perl.in.wiget Sat Oct 30 12:28:50 1999
83 +++ rpm-3.0.3/macros.perl.in Sat Oct 30 12:28:50 1999
85 +# Perl specific macro definitions.
86 +# To make use of these macros insert the following line into your spec file:
87 +# %include @RPMCONFIGDIR@/macros.perl
89 +%define __find_requires @RPMCONFIGDIR@/find-perl-requires
90 +%define __find_provides @RPMCONFIGDIR@/find-perl-provides
92 +%define perl_sitelib %(eval "`perl -V:installsitelib`"; echo $installsitelib)
93 +%define perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
94 +%define perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
96 --- rpm-3.0.3/configure.in.wiget Sat Oct 30 13:17:49 1999
97 +++ rpm-3.0.3/configure.in Sat Oct 30 13:18:52 1999
99 AC_MSG_RESULT(patch later then 2.2 found)
102 + AC_PATH_PROG(PERL, perl, /usr/bin/perl, $MYPATH)
103 AC_PATH_PROG(PGPBIN, pgp, /usr/bin/pgp, $MYPATH)
104 AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
105 AC_PATH_PROG(__TAR, tar, /bin/tar, $MYPATH)
107 export LIBS INCPATH CONFIG_SITE
109 AC_CONFIG_SUBDIRS(popt)
110 -AC_OUTPUT([Makefile rpmrc macros macros.pld lib/Makefile
111 - build/Makefile tools/Makefile scripts/Makefile
112 +AC_OUTPUT([Makefile rpmrc macros macros.pld macros.perl lib/Makefile
113 + build/Makefile tools/Makefile
114 + scripts/Makefile scripts/perl.req scripts/perl.prov
115 tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
116 misc/Makefile po/Makefile.in intl/Makefile
117 doc/Makefile doc/manual/Makefile doc/pl/Makefile doc/ru/Makefile
118 --- rpm-3.0.3/scripts/perl.req.pld Sat Oct 30 17:00:59 1999
119 +++ rpm-3.0.3/scripts/perl.req Sat Oct 30 17:01:08 1999
124 # a simple makedepends like script for perl.
131 + if (m=/usr/(bin|lib|share|X11R6/(lib|bin))/=) {
132 + if (! m=(/(doc|man|info|usr/src)/|\.so$)=) {
140 # contents of the file.
144 + if (m=/usr/(bin|lib|share|X11R6/(lib|bin))/=) {
145 + if (! m=(/(doc|man|info|usr/src)/|\.(so|pl|ph)$)=) {
153 foreach $module (sort keys %require) {
154 if (length($require{$module}) == 0) {
155 - print "perl($module)\n";
156 + if ($module =~ /^[0-9._]+$/) {
157 + print "perl >= $module\n";
159 + print "perl($module)\n";
163 - print "perl($module)>=$require{$module}\n";
164 + print "perl($module) >= $require{$module}\n";
166 # we need to print it without the version number until the
167 # requires syntax accepts version numbers correctly.
169 - print "perl($module)\n";
170 +# print "perl($module)\n";
177 # skip the documentation
178 - if ( (m/^=(head1|head2|pod)/) .. (m/^=(cut)/) ) {
179 + if ( (m/^=(head1|head2|pod|item)/) .. (m/^=(cut)/) ) {
184 # will be included with the name sys/systeminfo.ph so only use the
185 # basename of *.ph files
187 - ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
188 + # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
190 + # there is no need to generate dependencies for ph and pl files
191 + # so let's just skip them
193 + ($module =~ m/\.(ph|pl)$/) && next;
195 + # we don't provide platform specific modules for platforms other
196 + # than unix so we also shouldn't require them
198 + ($module =~ m/(Mac|OS2|MSDOS)::/) && next;
200 $require{$module}=$version;