1 --- rpm-5.3.1/configure.ac.wiget 2010-05-22 17:15:11.000000000 +0200
2 +++ rpm-5.3.1/configure.ac 2010-05-30 16:37:59.526924459 +0200
3 @@ -2198,6 +2198,7 @@ AC_CONFIG_FILES([ po/Makefile.in
4 build/Makefile build/auto/Makefile build/auto/desc build/auto/types
7 + scripts/perl.req scripts/perl.prov
9 macros/macros macros/macros.rpmbuild
10 macros/java macros/libtool macros/mono macros/perl
11 --- rpm-5.3.1/scripts/perl.req.wiget 2008-10-26 10:50:53.000000000 +0100
12 +++ rpm-5.3.1/scripts/perl.req 2010-05-30 16:35:36.999438206 +0200
17 # RPM (and its source code) is covered under two separate licenses.
24 + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
25 + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
32 @@ -49,7 +53,11 @@ if ("@ARGV") {
33 # contents of the file.
37 + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
38 + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
45 @@ -215,19 +223,41 @@ sub process_file {
47 $module =~ s/\(\s*\)$//;
49 - if ( $module =~ m/^v?([0-9._]+)$/ ) {
50 + if ( $module =~ m/^(v?)([0-9._]+)$/ ) {
51 # if module is a number then both require and use interpret that
52 # to mean that a particular version of perl is specified
55 - if ($ver =~ /5.00/) {
56 - print "perl >= 0:$ver\n";
60 - print "perl >= 1:$ver\n";
64 + if (($1 eq 'v') or ($ver =~ /[0-9]+\.[0-9]+\.[0-9]+/)) {
66 + if ($ver =~ m/5\.([0-5])(\.([0-9]+))?$/) {
68 + print "perl-base >= 0:5.00$1_$3\n";
70 + print "perl-base >= 0:5.00$1\n";
73 + print "perl-base >= 1:$ver\n";
77 + if ($ver =~ m/5\.(00[0-5])_?([0-9]+)?$/) {
79 + print "perl-base >= 0:5.$1_$2\n";
81 + print "perl-base >= 0:5.$1\n";
84 + # expand to M.NNN_nnn form
85 + $ver =~ s/^([0-9])$/$1./;
86 + $ver =~ s/^([0-9]\.[0-9]{0,5}|[0-9]\.[0-9]{3}_[0-9]{0,2})$/${1}000000/;
87 + $ver =~ s/^([0-9]\.[0-9]{3})_?([0-9]{3})0*$/$1_$2/;
88 + # match trimming leading 0s
89 + $ver =~ m/^([0-9])\.0*([1-9][0-9]*|0)_0*([1-9][0-9]*|0)$/;
90 + print "perl-base >= 1:$1.$2.$3\n";
97 @@ -244,7 +274,31 @@ sub process_file {
98 # will be included with the name sys/systeminfo.ph so only use the
99 # basename of *.ph files
101 - ($module =~ m/\.ph$/) && next;
102 + # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
104 + # there is no need to generate dependencies for ph, pl or test files
105 + # so let's just skip them.
107 + ($module =~ m/\.(ph|pl|t)$/) && next;
109 + # skip all modules for platforms other than linux.
111 + ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next;
113 + # if the module name starts in a dot it is not a module name.
115 + ($module =~ m/^\./) && next;
117 + # if the module ends with .pm strip it to leave only basename.
119 + $module =~ s/\.pm$//;
121 + $module =~ s/\//::/;
123 + # trim off trailing parenthesis if any. Sometimes people pass
124 + # the module an empty list.
126 + $module =~ s/\(\s*\)$//;
128 $require{$module}=$version;