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.prov.wiget Fri Feb 1 16:20:26 2002
10 +++ rpm-4.1/scripts/perl.prov Wed Sep 18 23:50:15 2002
16 + if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) {
23 # contents of the file.
27 + if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) {
33 --- rpm-4.1/scripts/perl.req.wiget Mon Jun 3 22:56:33 2002
34 +++ rpm-4.1/scripts/perl.req Wed Sep 18 23:50:15 2002
39 # RPM (and it's source code) is covered under two separate licenses.
46 + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
47 + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
55 # contents of the file.
59 + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
60 + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
68 foreach $module (sort keys %require) {
69 if (length($require{$module}) == 0) {
70 - print "perl($module)\n";
71 + if ($module =~ /^[0-9._]+$/) {
72 + print "perl >= $module\n";
74 + print "perl($module)\n";
78 # I am not using rpm3.0 so I do not want spaces arround my
80 # will be included with the name sys/systeminfo.ph so only use the
81 # basename of *.ph files
83 - ($module =~ m/\.ph$/) && next;
84 + # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
86 + # there is no need to generate dependencies for ph, pl or test files
87 + # so let's just skip them.
89 + ($module =~ m/\.(ph|pl|t)$/) && next;
91 + # skip all modules for platforms other than linux.
93 + ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next;
95 + # if the module name starts in a dot it is not a module name.
97 + ($module =~ m/^\./) && next;
99 + # if the module ends with .pm strip it to leave only basename.
101 + $module =~ s/\.pm$//;
103 + $module =~ s/\//::/;
105 + # trim off trailing parenthesis if any. Sometimes people pass
106 + # the module an empty list.
108 + $module =~ s/\(\s*\)$//;
110 $require{$module}=$version;
112 --- rpm-4.1/configure.ac.wiget Thu Aug 22 19:01:34 2002
113 +++ rpm-4.1/configure.ac Wed Sep 18 23:50:46 2002
114 @@ -1194,6 +1194,7 @@
115 AC_CONFIG_SUBDIRS(popt beecrypt zlib libelf db3)
117 AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
118 + macros.perl scripts/perl.req scripts/perl.prov
119 rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
120 scripts/Makefile scripts/brp-redhat
121 scripts/macros.perl scripts/macros.php scripts/macros.python
122 --- rpm-4.1/macros.in.wiget Sun Sep 1 00:30:19 2002
123 +++ rpm-4.1/macros.in Wed Sep 18 23:50:46 2002
124 @@ -1012,8 +1012,10 @@
125 # %dir %{perl_sitearch}/auto/Image
127 %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")
128 -%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
129 -%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
131 +# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros
132 +# has been moved to macros.perl (see info in this file for details).
135 #------------------------------------------------------------------------------
136 # arch macro for all Intel i?86 compatibile processors