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/scripts/perl.req.wiget Sat Jun 5 22:52:31 1999
70 +++ rpm-3.0.3/scripts/perl.req Sat Oct 30 12:34:07 1999
75 # a simple makedepends like script for perl.
82 + if (m=/usr/(bin|lib|share|X11R6/(lib|bin))/=) {
83 + if (! m=(/((doc|man|info)|/usr/src)/)\.so$)=) {
91 # contents of the file.
95 + if (m=/usr/(bin|lib|share|X11R6/(lib|bin))/=) {
96 + if (! m=(/((doc|man|info)|/usr/src)/)\.(so|pl|ph)$)=) {
104 foreach $module (sort keys %require) {
105 if (length($require{$module}) == 0) {
106 - print "perl($module)\n";
107 + if ($module =~ /^[0-9._]+$/) {
108 + print "perl >= $module\n";
110 + if ($module !~ /\.ph$/ && $module !~ /\.pl/) {
111 + print "perl($module)\n";
116 - print "perl($module)>=$require{$module}\n";
117 + print "perl($module) >= $require{$module}\n";
119 # we need to print it without the version number until the
120 # requires syntax accepts version numbers correctly.
122 - print "perl($module)\n";
123 +# print "perl($module)\n";
130 # skip the documentation
131 - if ( (m/^=(head1|head2|pod)/) .. (m/^=(cut)/) ) {
132 + if ( (m/^=(head1|head2|pod|item)/) .. (m/^=(cut)/) ) {
136 --- rpm-3.0.3/macros.in.wiget Sat Oct 30 12:28:50 1999
137 +++ rpm-3.0.3/macros.in Sat Oct 30 12:28:50 1999
139 # %{perl_sitearch}/Image
140 # %dir %{perl_sitearch}/auto/Image
143 +# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros
144 +# has been moved to macros.perl (see info in this file for details).
146 %requires_eq() %(LC_ALL="C" rpm -q --queryformat 'Requires:%%{NAME} = %%{VERSION}' %1| grep -v "is not")
147 -%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
148 -%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
149 --- rpm-3.0.3/macros.perl.in.wiget Sat Oct 30 12:28:50 1999
150 +++ rpm-3.0.3/macros.perl.in Sat Oct 30 12:28:50 1999
152 +# Perl specific macro definitions.
153 +# To make use of these macros insert the following line into your spec file:
154 +# %include @RPMCONFIGDIR@/macros.perl
156 +%define __find_requires @RPMCONFIGDIR@/find-perl-requires
157 +%define __find_provides @RPMCONFIGDIR@/find-perl-provides
159 +%define perl_sitelib %(eval "`perl -V:installsitelib`"; echo $installsitelib)
160 +%define perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
161 +%define perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
163 --- rpm-3.0.3/configure.in.wiget Sat Oct 30 12:28:50 1999
164 +++ rpm-3.0.3/configure.in Sat Oct 30 12:28:50 1999
166 AC_MSG_RESULT(patch later then 2.2 found)
169 + AC_PATH_PROG(PERL, perl, /usr/bin/perl, $MYPATH)
170 AC_PATH_PROG(PGPBIN, pgp, /usr/bin/pgp, $MYPATH)
171 AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
172 AC_PATH_PROG(__TAR, tar, /bin/tar, $MYPATH)
175 AC_CONFIG_SUBDIRS(popt)
176 AC_OUTPUT([Makefile rpmrc macros macros.pld lib/Makefile
177 - build/Makefile tools/Makefile scripts/Makefile
178 + build/Makefile tools/Makefile
179 + scripts/Makefile scripts/perl.req scripts/perl.prov
180 tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
181 misc/Makefile po/Makefile.in intl/Makefile
182 doc/Makefile doc/manual/Makefile doc/pl/Makefile doc/ru/Makefile