- specialcase ExtUtils::CBuilder|Compress::Raw::Bzip2|Compress::Raw::Zlib checking...

[packages/perl.git] / perl.spec

diff --git a/perl.spec b/perl.spec
index 987405c20d0604b651d876b43342a2f2dfb3e434..a8cd80b033e3fab2ec02af21524775b8d4e6d2d4 100644 (file)
--- a/perl.spec
+++ b/perl.spec
@@ -44,8 +44,8 @@
 %define                perl_mod2verrel()       %([ -f %{SOURCE4} ] && awk -vp=%1 -vr=%2 '$1 == p { print $4"-"r }' %{SOURCE4} || echo ERROR)
 %define                perl_mod2version()      %([ -f %{SOURCE4} ] && awk -vp=%1 '$1 == p { m=$2; printf("perl-%s = %s\\n", p, $4)}END{if (!m) printf("# Error looking up [%s]\\n", p) }' %{SOURCE4} || echo ERROR)
 
-%define                ver     5.18.1
-%define                rel     3
+%define                ver     5.18.2
+%define                rel     1
 Summary:       Practical Extraction and Report Language (Perl)
 Summary(cs.UTF-8):     Programovací jazyk Perl
 Summary(da.UTF-8):     Programmeringssproget Perl
@@ -74,7 +74,7 @@ Epoch:                1
 License:       GPL v1+ or Artistic
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/src/5.0/%{name}-%{ver}.tar.gz
-# Source0-md5: 304cb5bd18e48c44edd6053337d3386d
+# Source0-md5: 373f57ccc441dbc1812435f45ad20660
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: de47d7893f49ad7f41ba69c78511c0db
 Source2:       %{name}.prov
@@ -911,8 +911,12 @@ for m in $(awk '!/^#/ && !/^$/{print $1}' %{SOURCE3}); do
        libnet)
                v=$(awk '/^libnet /{print $2; exit}' cpan/libnet/Changes)
                ;;
+       # special cased since do eval on VERSION
+       ExtUtils::CBuilder|Compress::Raw::Bzip2|Compress::Raw::Zlib)
+               v=$(%{__perl} -M$m -e "print version->parse(\$$m::VERSION)->numify")
+               ;;
        *)
-               v=$(%{__perl} -M$m -e "print $m->VERSION" )
+               v=$(%{__perl} -M$m -e "print \$$m::VERSION")
                ;;
        esac
        echo "$m = $v"
@@ -921,15 +925,19 @@ echo '# Non-straight named module versions from Perl %{ver} distribution.' > per
 for m in $(awk '!/^#/ && !/^$/{print $1"!"$2}' %{SOURCE4}); do
        mn="${m##*!}"
        mp="${m%%!*}"
-       v=$(%{__perl} -M$mn -e "print $mn->VERSION" )
+       case $m in
+       # special cased since do eval on VERSION
+       ExtUtils::CBuilder|Compress::Raw::Bzip2|Compress::Raw::Zlib)
+               v=$(%{__perl} -M$mn -e "print version->parse(\$$mn::VERSION)->numify")
+               ;;
+       *)
+               v=$(%{__perl} -M$mn -e "print \$$mn::VERSION")
+               ;;
+       esac
        echo "$mp       $mn = $v"
 done | LC_ALL=C sort >> perl-modules2
 
-# ExtUtils::CBuilder Compress::Raw::Bzip2 Compress::Raw::Zlib ignored due to VERSION from the loop above
-# is missing ending '0'
-grep -Ev '^([  ]*$|[;#])' %{SOURCE3} | grep -Ev 'ExtUtils::CBuilder|Compress::Raw::Bzip2|Compress::Raw::Zlib' > .mods1
-grep -Ev '^([  ]*$|[;#])' perl-modules | grep -Ev 'ExtUtils::CBuilder|Compress::Raw::Bzip2|Compress::Raw::Zlib' > .mods2
-if ! cmp -s .mods1 .mods2; then
+if ! cmp -s %{SOURCE3} perl-modules; then
        : %{SOURCE3} outdated with $(pwd)/perl-modules
        exit 1
 fi