Parcourir la source

finally upgrade to the newer Perl compression modules by repackaging the whole stuff from scratch (as the inter-dependencies are very confusing and partly historic and hence unclean)

Ralf S. Engelschall il y a 18 ans
Parent
commit
e62fad94a6
1 fichiers modifiés avec 114 ajouts et 36 suppressions
  1. 114 36
      perl-comp/perl-comp.spec

+ 114 - 36
perl-comp/perl-comp.spec

@@ -24,10 +24,17 @@
 
 #   versions of individual parts
 %define       V_perl                 5.8.8
-%define       V_compress_zlib        1.42
+%define       V_compress_raw_zlib    2.006
+%define       V_compress_raw_bzip2   2.006
 %define       V_compress_lzo         1.08
-%define       V_compress_bzip2       2.09
 %define       V_compress_lzf         1.8
+%define       V_io_compress_base     2.006
+%define       V_io_compress_bzip2    2.006
+%define       V_io_compress_zlib     2.006
+%define       V_io_compress_lzop     2.006
+%define       V_io_compress_lzf      2.006
+%define       V_compress_zlib        2.007
+%define       V_compress_bzip2       2.09
 %define       V_io_zlib              1.07
 
 #   package information
@@ -41,14 +48,21 @@ Class:        BASE
 Group:        Perl
 License:      GPL/Artistic
 Version:      %{V_perl}
-Release:      20070728
+Release:      20071005
 
 #   list of sources
-Source0:      http://www.cpan.org/modules/by-module/Compress/Compress-Zlib-%{V_compress_zlib}.tar.gz
-Source1:      http://www.cpan.org/modules/by-module/Compress/Compress-LZO-%{V_compress_lzo}.tar.gz
-Source2:      http://www.cpan.org/authors/id/A/AR/ARJAY/Compress-Bzip2-%{V_compress_bzip2}.tar.gz
-Source3:      http://www.cpan.org/modules/by-module/IO/IO-Zlib-%{V_io_zlib}.tar.gz
-Source4:      http://www.cpan.org/modules/by-module/Compress/Compress-LZF-%{V_compress_lzf}.tar.gz
+Source0:      http://www.cpan.org/modules/by-module/Compress/Compress-Raw-Zlib-%{V_compress_raw_zlib}.tar.gz
+Source1:      http://www.cpan.org/modules/by-module/Compress/Compress-Raw-Bzip2-%{V_compress_raw_bzip2}.tar.gz
+Source2:      http://www.cpan.org/modules/by-module/Compress/Compress-LZO-%{V_compress_lzo}.tar.gz
+Source3:      http://www.cpan.org/modules/by-module/Compress/Compress-LZF-%{V_compress_lzf}.tar.gz
+Source4:      http://www.cpan.org/modules/by-module/IO/IO-Compress-Base-%{V_io_compress_base}.tar.gz
+Source5:      http://www.cpan.org/modules/by-module/IO/IO-Compress-Zlib-%{V_io_compress_zlib}.tar.gz
+Source6:      http://www.cpan.org/modules/by-module/IO/IO-Compress-Bzip2-%{V_io_compress_bzip2}.tar.gz
+Source7:      http://www.cpan.org/modules/by-module/IO/IO-Compress-Lzop-%{V_io_compress_lzop}.tar.gz
+Source8:      http://www.cpan.org/modules/by-module/IO/IO-Compress-Lzf-%{V_io_compress_lzf}.tar.gz
+Source9:      http://www.cpan.org/modules/by-module/Compress/Compress-Zlib-%{V_compress_zlib}.tar.gz
+Source10:     http://www.cpan.org/modules/by-module/Compress/Compress-Bzip2-%{V_compress_bzip2}.tar.gz
+Source11:     http://www.cpan.org/modules/by-module/IO/IO-Zlib-%{V_io_zlib}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
@@ -62,33 +76,75 @@ AutoReqProv:  no
 
 %description
     Perl modules for use with Compression:
-    - Compress::Zlib (%{V_compress_zlib})
+    - Compress::Raw::Zlib (%{V_compress_raw_zlib})
+    - Compress::Raw::Bzip2 (%{V_compress_raw_bzip2})
     - Compress::LZO (%{V_compress_lzo})
-    - Compress::Bzip2 (%{V_compress_bzip2})
     - Compress::LZF (%{V_compress_lzf})
+    - IO::Compress::Base (%{V_io_compress_base})
+    - IO::Compress::Zlib (%{V_io_compress_zlib})
+    - IO::Compress::Bzip2 (%{V_io_compress_bzip2})
+    - IO::Compress::Lzop (%{V_io_compress_lzop})
+    - IO::Compress::Lzf (%{V_io_compress_lzf})
+    - Compress::Zlib (%{V_compress_zlib})
+    - Compress::Bzip2 (%{V_compress_bzip2})
     - IO::Zlib (%{V_io_zlib})
 
 %track
-    prog perl-comp:Compress-Bzip2 = {
-        version   = %{V_compress_bzip2}
-        url       = http://www.cpan.org/authors/id/A/AR/ARJAY/
-        regex     = Compress-Bzip2-(__VER__)\.tar\.gz
+    prog perl-comp:Compress-Raw-Zlib = {
+        version   = %{V_compress_raw_zlib}
+        url       = http://www.cpan.org/modules/by-module/Compress/
+        regex     = Compress-Raw-Zlib-(__VER__)\.tar\.gz
+    }
+    prog perl-comp:Compress-Raw-Bzip2 = {
+        version   = %{V_compress_raw_bzip2}
+        url       = http://www.cpan.org/modules/by-module/Compress/
+        regex     = Compress-Raw-Bzip2-(__VER__)\.tar\.gz
     }
     prog perl-comp:Compress-LZO = {
         version   = %{V_compress_lzo}
         url       = http://www.cpan.org/modules/by-module/Compress/
         regex     = Compress-LZO-(__VER__)\.tar\.gz
     }
+    prog perl-comp:Compress-LZF = {
+        version   = %{V_compress_lzf}0
+        url       = http://www.cpan.org/modules/by-module/Compress/
+        regex     = Compress-LZF-(__VER__)\.tar\.gz
+        transform = "s/^(\\d+\\.\\d)$/${1}0/; $_"
+    }
+    prog perl-comp:IO-Compress-Base = {
+        version   = %{V_io_compress_base}
+        url       = http://www.cpan.org/modules/by-module/IO/
+        regex     = IO-Compress-Base-(__VER__)\.tar\.gz
+    }
+    prog perl-comp:IO-Compress-Zlib = {
+        version   = %{V_io_compress_zlib}
+        url       = http://www.cpan.org/modules/by-module/IO/
+        regex     = IO-Compress-Zlib-(__VER__)\.tar\.gz
+    }
+    prog perl-comp:IO-Compress-Bzip2 = {
+        version   = %{V_io_compress_bzip2}
+        url       = http://www.cpan.org/modules/by-module/IO/
+        regex     = IO-Compress-Bzip2-(__VER__)\.tar\.gz
+    }
+    prog perl-comp:IO-Compress-Lzop = {
+        version   = %{V_io_compress_lzop}
+        url       = http://www.cpan.org/modules/by-module/IO/
+        regex     = IO-Compress-Lzop-(__VER__)\.tar\.gz
+    }
+    prog perl-comp:IO-Compress-Lzf = {
+        version   = %{V_io_compress_lzf}
+        url       = http://www.cpan.org/modules/by-module/IO/
+        regex     = IO-Compress-Lzf-(__VER__)\.tar\.gz
+    }
     prog perl-comp:Compress-Zlib = {
         version   = %{V_compress_zlib}
         url       = http://www.cpan.org/modules/by-module/Compress/
         regex     = Compress-Zlib-(__VER__)\.tar\.gz
     }
-    prog perl-comp:Compress-LZF = {
-        version   = %{V_compress_lzf}0
+    prog perl-comp:Compress-Bzip2 = {
+        version   = %{V_compress_bzip2}
         url       = http://www.cpan.org/modules/by-module/Compress/
-        regex     = Compress-LZF-(__VER__)\.tar\.gz
-        transform = "s/^(\\d+\\.\\d)$/${1}0/; $_"
+        regex     = Compress-Bzip2-(__VER__)\.tar\.gz
     }
     prog perl-comp:IO-Zlib = {
         version   = %{V_io_zlib}
@@ -102,32 +158,54 @@ AutoReqProv:  no
     %setup -q -T -D -a 2
     %setup -q -T -D -a 3
     %setup -q -T -D -a 4
+    %setup -q -T -D -a 5
+    %setup -q -T -D -a 6
+    %setup -q -T -D -a 7
+    %setup -q -T -D -a 8
+    %setup -q -T -D -a 9
+    %setup -q -T -D -a 10
+    %setup -q -T -D -a 11
 
 %build
 
 %install
     rm -rf $RPM_BUILD_ROOT
     %{l_prefix}/bin/perl-openpkg prepare
-    ( echo "BUILD_ZLIB = False"
+
+    #   build XS-based Compress::Raw::Zlib
+    ( echo "BUILD_ZLIB = 0"
       echo "INCLUDE    = %{l_prefix}/include"
       echo "LIB        = %{l_prefix}/lib"
-    ) >>Compress-Zlib-%{V_compress_zlib}/config.in
-    ( cd Compress-LZO-%{V_compress_lzo}
-      %{l_shtool} subst \
-          -e 's:^#\($LZO_INCLUDE[^=]*\)=.*:\1= "%{l_cppflags lzo}";:' \
-          -e 's:^#\($LZO_LIB[^=]*\)=.*:\1= "%{l_ldflags}";:' \
-          Makefile.PL
-    ) || exit $?
-    ( echo "BUILD_BZLIB   = False"
-      echo "BZLIB_INCLUDE = %{l_prefix}/include"
-      echo "BZLIB_LIB     = %{l_prefix}/lib"
-      echo "BZLIB_BIN     = %{l_prefix}/bin"
-    ) >>Compress-Bzip2-%{V_compress_bzip2}/config.in
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE0} configure build install
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE1} configure build install
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE2} configure build install
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE3} configure build install
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE4} configure build install
+    ) >>Compress-Raw-Zlib-%{V_compress_raw_zlib}/config.in
+    %{l_prefix}/bin/perl-openpkg -d Compress-Raw-Zlib-%{V_compress_zlib} \
+        configure build install
+
+    #   build XS-based Compress::Raw::Bzip2
+    BUILD_BZIP2=0 \
+    BZIP2_INCLUDE=%{l_prefix}/include \
+    BZIP2_LIB=%{l_prefix}/lib \
+    %{l_prefix}/bin/perl-openpkg -d Compress-Raw-Bzip2-%{V_compress_raw_bzip2} \
+        configure build install
+
+    #   build XS-based Compress::LZO
+    %{l_shtool} subst \
+        -e 's:^#\($LZO_INCLUDE[^=]*\)=.*:\1= "%{l_cppflags lzo}";:' \
+        -e 's:^#\($LZO_LIB[^=]*\)=.*:\1= "%{l_ldflags}";:' \
+        Compress-LZO-%{V_compress_lzo}/Makefile.PL
+    %{l_prefix}/bin/perl-openpkg -d Compress-LZO-%{V_compress_lzo} \
+        configure build install
+
+    #   build regular modules
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE3}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE4}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE5}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE6}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE7}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE8}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE9}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE10} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE11} configure build install
+
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat perl-openpkg-files`