upgrading package: lzma 4.52 -> 4.x

lzma/lzma.spec

@@ -23,24 +23,26 @@
 ##
 
 #   package version
-%define       V_dist 452
-%define       V_opkg 4.52
+%define       V_opkg      4.x
+%define       V_lzmautils 4.42.0alpha6
+%define       V_sdk       452
 
 #   package information
 Name:         lzma
 Summary:      Lempel-Ziv-Markov Algorithm (LZMA) Compression
-URL:          http://www.7-zip.org/
-Vendor:       Igor Pavlov
+URL:          http://tukaani.org/lzma/
+Vendor:       Igor Pavlov, Lasse Collin
 Packager:     OpenPKG Foundation e.V.
 Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Compression
 License:      LGPL
 Version:      %{V_opkg}
-Release:      20070803
+Release:      20071014
 
 #   list of sources
-Source0:      http://switch.dl.sourceforge.net/sevenzip/7z%{V_dist}.tar.bz2
+Source0:      http://tukaani.org/lzma/lzma-%{V_lzmautils}.tar.gz
+Source1:      http://switch.dl.sourceforge.net/sevenzip/7z%{V_sdk}.tar.bz2
 
 #   build information
 Prefix:       %{l_prefix}
@@ -62,16 +64,39 @@ AutoReqProv:  no
     higher CPU and RAM requirements for compression.
 
 %track
-    prog lzma = {
-        version   = %{V_dist}
+    prog lzma:lzmautils = {
+        version   = %{V_lzmautils}
+        url       = http://tukaani.org/lzma/download
+        regex     = lzma-(__VER__)\.tar\.gz
+    }
+    prog lzma:sdk = {
+        version   = %{V_sdk}
         url       = http://prdownloads.sourceforge.net/sevenzip/
         regex     = 7z(__VER__)\.tar\.bz2
     }
 
 %prep
     %setup -q -c
+    %setup -q -c -T -D -a 1
 
 %build
+    #   build LZMA from LZMA Utils
+    ( cd lzma-%{V_lzmautils}
+      CC="%{l_cc}" \
+      CXX="%{l_cxx}" \
+      CFLAGS="%{l_cflags -O}" \
+      CXXFLAGS="%{l_cxxflags -O}" \
+      ./configure \
+          --prefix=%{l_prefix} \
+          --mandir=%{l_prefix}/man \
+          --without-libiconv-prefix \
+          --without-libintl-prefix \
+          --disable-nls \
+          --disable-shared
+      %{l_make} %{l_mflags}
+    ) || exit $?
+
+    #   build LZMA from 7-Zip SDK
     ( cd CPP/7zip/Compress/LZMA_Alone
       %{l_make} %{l_mflags} -f makefile.gcc \
           CXX="%{l_cxx} %{l_cxxflags -O} -D_LZMA_SYSTEM_SIZE_T" \
@@ -80,11 +105,24 @@ AutoReqProv:  no
 
 %install
     rm -rf $RPM_BUILD_ROOT
+
+    #   install LZMA from LZMA Utils
+    ( cd lzma-%{V_lzmautils}
+      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+      %{l_shtool} mkdir -f -p -m 755 \
+          $RPM_BUILD_ROOT%{l_prefix}/include
+      %{l_shtool} install -c -m 644 \
+          src/common/lzma.h $RPM_BUILD_ROOT%{l_prefix}/include/
+    ) || exit $?
+
+    #   install LZMA from 7-Zip SDK
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/bin
     %{l_shtool} install -c -s -m 755 \
         CPP/7zip/Compress/LZMA_Alone/lzma \
-        $RPM_BUILD_ROOT%{l_prefix}/bin/
+        $RPM_BUILD_ROOT%{l_prefix}/bin/lzma-7z
+
+    #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files