1 diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac
2 --- rpm-4.3.org/configure.ac 2004-01-07 01:51:35.251160244 +0100
3 +++ rpm-4.3/configure.ac 2004-01-07 01:55:53.198560246 +0100
5 Doxyfile Makefile macros rpmpopt rpm.spec
6 rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
7 scripts/Makefile scripts/macros.perl scripts/macros.php
8 + scripts/perl.req scripts/perl.prov
9 scripts/macros.python tools/Makefile misc/Makefile doc/Makefile
10 doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
11 doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile
12 --- rpm-4.4.9/scripts/perl.req.orig 2006-07-08 16:13:50.000000000 +0200
13 +++ rpm-4.4.9/scripts/perl.req 2008-03-24 01:13:31.985544655 +0100
18 # RPM (and its source code) is covered under two separate licenses.
25 + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
26 + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
34 # contents of the file.
38 + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
39 + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
48 $module =~ s/\(\s*\)$//;
50 - if ( $module =~ m/^v?([0-9._]+)$/ ) {
51 + if ( $module =~ m/^(v?)([0-9._]+)$/ ) {
52 # if module is a number then both require and use interpret that
53 # to mean that a particular version of perl is specified
56 - if ($ver =~ /5.00/) {
57 - print "perl >= 0:$ver\n";
61 - print "perl >= 1:$ver\n";
65 + if (($1 eq 'v') or ($ver =~ /[0-9]+\.[0-9]+\.[0-9]+/)) {
67 + if ($ver =~ m/5\.([0-5])(\.([0-9]+))?$/) {
69 + print "perl-base >= 0:5.00$1_$3\n";
71 + print "perl-base >= 0:5.00$1\n";
74 + print "perl-base >= 1:$ver\n";
78 + if ($ver =~ m/5\.(00[0-5])_?([0-9]+)?$/) {
80 + print "perl-base >= 0:5.$1_$2\n";
82 + print "perl-base >= 0:5.$1\n";
85 + # expand to M.NNN_nnn form
86 + $ver =~ s/^([0-9])$/$1./;
87 + $ver =~ s/^([0-9]\.[0-9]{0,5}|[0-9]\.[0-9]{3}_[0-9]{0,2})$/${1}000000/;
88 + $ver =~ s/^([0-9]\.[0-9]{3})_?([0-9]{3})0*$/$1_$2/;
89 + # match trimming leading 0s
90 + $ver =~ m/^([0-9])\.0*([1-9][0-9]*|0)_0*([1-9][0-9]*|0)$/;
91 + print "perl-base >= 1:$1.$2.$3\n";
99 # will be included with the name sys/systeminfo.ph so only use the
100 # basename of *.ph files
102 - ($module =~ m/\.ph$/) && next;
103 + # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
105 + # there is no need to generate dependencies for ph, pl or test files
106 + # so let's just skip them.
108 + ($module =~ m/\.(ph|pl|t)$/) && next;
110 + # skip all modules for platforms other than linux.
112 + ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next;
114 + # if the module name starts in a dot it is not a module name.
116 + ($module =~ m/^\./) && next;
118 + # if the module ends with .pm strip it to leave only basename.
120 + $module =~ s/\.pm$//;
122 + $module =~ s/\//::/;
124 + # trim off trailing parenthesis if any. Sometimes people pass
125 + # the module an empty list.
127 + $module =~ s/\(\s*\)$//;
129 $require{$module}=$version;