1 --- rpm-4.0.2/scripts/Makefile.am.wiget Tue Dec 12 17:47:59 2000
2 +++ rpm-4.0.2/scripts/Makefile.am Fri Aug 10 12:44:47 2001
4 find-prov.pl find-req.pl cpanflute find-provides.perl \
5 find-requires.perl get_magic.pl getpo.sh http.req \
6 magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi \
7 - trpm u_pkg.sh vpkg-provides.sh vpkg-provides2.sh
8 + trpm u_pkg.sh vpkg-provides.sh vpkg-provides2.sh \
9 + find-perl-requires find-perl-provides
11 installprefix = $(DESTDIR)
14 find-prov.pl find-req.pl cpanflute find-provides.perl \
15 find-requires.perl get_magic.pl getpo.sh http.req \
16 magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \
17 - vpkg-provides.sh vpkg-provides2.sh
18 + vpkg-provides.sh vpkg-provides2.sh \
19 + find-perl-requires find-perl-provides
20 --- rpm-4.0.2/scripts/perl.prov.wiget Mon Jan 17 19:58:36 2000
21 +++ rpm-4.0.2/scripts/perl.prov Fri Aug 10 12:44:47 2001
27 + if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) {
34 # contents of the file.
38 + if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) {
44 --- rpm-4.0.2/scripts/perl.req.wiget Mon Jan 17 19:58:36 2000
45 +++ rpm-4.0.2/scripts/perl.req Fri Aug 10 12:44:47 2001
50 # RPM (and it's source code) is covered under two separate licenses.
57 + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
58 + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
66 # contents of the file.
70 + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
71 + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
79 foreach $module (sort keys %require) {
80 if (length($require{$module}) == 0) {
81 - print "perl($module)\n";
82 + if ($module =~ /^[0-9._]+$/) {
83 + print "perl >= $module\n";
85 + print "perl($module)\n";
89 # I am not using rpm3.0 so I do not want spaces arround my
91 # will be included with the name sys/systeminfo.ph so only use the
92 # basename of *.ph files
94 - ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
95 + # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
97 + # there is no need to generate dependencies for ph, pl or test files
98 + # so let's just skip them.
100 + ($module =~ m/\.(ph|pl|t)$/) && next;
102 + # skip all modules for platforms other than linux.
104 + ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next;
106 + # if the module name starts in a dot it is not a module name.
108 + ($module =~ m/^\./) && next;
110 + # if the module ends with .pm strip it to leave only basename.
112 + $module =~ s/\.pm$//;
114 + $module =~ s/\//::/;
116 + # trim off trailing parenthesis if any. Sometimes people pass
117 + # the module an empty list.
119 + $module =~ s/\(\s*\)$//;
122 $require{$module}=$version;
123 --- rpm-4.0.2/configure.in.wiget Sun Feb 25 18:13:26 2001
124 +++ rpm-4.0.2/configure.in Fri Aug 10 12:48:21 2001
126 AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
127 AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
128 AC_PATH_PROG(__PATCH, patch, /usr/bin/patch, $MYPATH)
129 + AC_PATH_PROG(PERL, perl, /usr/bin/perl, $MYPATH)
130 AC_MSG_CHECKING(old version of patch)
131 PATCHVERSION=`patch --version 2>&1`
133 @@ -1086,6 +1087,7 @@
135 AC_CONFIG_SUBDIRS(popt)
136 AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec scripts/brp-redhat
137 + macros.perl scripts/perl.req scripts/perl.prov
138 rpmio/Makefile lib/Makefile build/Makefile tools/Makefile
140 tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
141 --- rpm-4.0.2/macros.in.wiget Fri Aug 10 12:44:47 2001
142 +++ rpm-4.0.2/macros.in Fri Aug 10 12:44:47 2001
144 # %{perl_sitearch}/Image
145 # %dir %{perl_sitearch}/auto/Image
148 +# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros
149 +# has been moved to macros.perl (see info in this file for details).
151 %requires_eq() %(LC_ALL="C" rpm -q --queryformat 'Requires:%%{NAME} = %%{VERSION}' %1| grep -v "is not")
152 -%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
153 -%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
155 #------------------------------------------------------------------------------
156 # arch macro for all Intel i?86 compatibile processors