1 --- rpm-4.1/scripts/Makefile.am.wiget Thu Aug 22 19:31:42 2002
2 +++ rpm-4.1/scripts/Makefile.am Wed Sep 18 23:52:19 2002
4 magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi \
5 rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
6 sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \
7 + find-perl-requires find-perl-provides \
8 vpkg-provides.sh vpkg-provides2.sh
9 --- rpm-4.1/scripts/perl.req.wiget Mon Jun 3 22:56:33 2002
10 +++ rpm-4.1/scripts/perl.req Wed Sep 18 23:50:15 2002
15 # RPM (and it's source code) is covered under two separate licenses.
22 + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
23 + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
31 # contents of the file.
35 + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
36 + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
44 foreach $module (sort keys %require) {
45 if (length($require{$module}) == 0) {
46 - print "perl($module)\n";
47 + if ($module =~ /^[0-9._]+$/) {
48 + print "perl >= $module\n";
50 + print "perl($module)\n";
54 # I am not using rpm3.0 so I do not want spaces arround my
56 # will be included with the name sys/systeminfo.ph so only use the
57 # basename of *.ph files
59 - ($module =~ m/\.ph$/) && next;
60 + # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
62 + # there is no need to generate dependencies for ph, pl or test files
63 + # so let's just skip them.
65 + ($module =~ m/\.(ph|pl|t)$/) && next;
67 + # skip all modules for platforms other than linux.
69 + ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next;
71 + # if the module name starts in a dot it is not a module name.
73 + ($module =~ m/^\./) && next;
75 + # if the module ends with .pm strip it to leave only basename.
77 + $module =~ s/\.pm$//;
79 + $module =~ s/\//::/;
81 + # trim off trailing parenthesis if any. Sometimes people pass
82 + # the module an empty list.
84 + $module =~ s/\(\s*\)$//;
86 $require{$module}=$version;
88 --- rpm-4.1/configure.ac.wiget Thu Aug 22 19:01:34 2002
89 +++ rpm-4.1/configure.ac Wed Sep 18 23:50:46 2002
91 AC_CONFIG_SUBDIRS(popt beecrypt zlib libelf db3)
93 AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
94 + macros.perl scripts/perl.req scripts/perl.prov
95 rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
96 scripts/Makefile scripts/brp-redhat
97 scripts/macros.perl scripts/macros.php scripts/macros.python
98 --- rpm-4.1/macros.in.wiget Sun Sep 1 00:30:19 2002
99 +++ rpm-4.1/macros.in Wed Sep 18 23:50:46 2002
100 @@ -1012,8 +1012,10 @@
101 # %dir %{perl_sitearch}/auto/Image
103 %requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
104 -%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
105 -%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
107 +# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros
108 +# has been moved to macros.perl (see info in this file for details).
111 #------------------------------------------------------------------------------
112 # arch macro for all Intel i?86 compatibile processors