OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 10-Feb-2009 08:52:24
Branch: HEAD Handle: 2009021007522400
Modified files:
openpkg-src/lzma lzma.spec
Log:
factor out LZMAUtils (which now becomes XZ)
Summary:
Revision Changes Path
1.19 +5 -37 openpkg-src/lzma/lzma.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lzma/lzma.spec
============================================================================
$ cvs diff -u -r1.18 -r1.19 lzma.spec
--- openpkg-src/lzma/lzma.spec 30 Jan 2009 17:34:38 -0000 1.18
+++ openpkg-src/lzma/lzma.spec 10 Feb 2009 07:52:24 -0000 1.19
@@ -22,9 +22,8 @@
##
# package version
-%define V_opkg 4.x
-%define V_lzmautils 4.999.5alpha
-%define V_sdk 464
+%define V_opkg 4.65
+%define V_sdk 465
# package information
Name: lzma
@@ -37,11 +36,10 @@
Group: Compression
License: LGPL
Version: %{V_opkg}
-Release: 20090130
+Release: 20090210
# list of sources
-Source0: http://tukaani.org/lzma/lzma-%{V_lzmautils}.tar.gz
-Source1: http://switch.dl.sourceforge.net/sevenzip/7z%{V_sdk}.tar.bz2
+Source0: http://switch.dl.sourceforge.net/sevenzip/7z%{V_sdk}.tar.bz2
# build information
Prefix: %{l_prefix}
@@ -63,12 +61,7 @@
higher CPU and RAM requirements for compression.
%track
- prog lzma:lzmautils = {
- version = %{V_lzmautils}
- url = http://tukaani.org/lzma/download
- regex = lzma-(__VER__)\.tar\.gz
- }
- prog lzma:sdk = {
+ prog lzma = {
version = %{V_sdk}
url = http://prdownloads.sourceforge.net/sevenzip/
regex = 7z(__VER__)\.tar\.bz2
@@ -76,24 +69,8 @@
%prep
%setup -q -c
- %setup -q -c -T -D -a 1
%build
- # build LZMA from LZMA Utils
- ( cd lzma-%{V_lzmautils}
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -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" \
@@ -102,20 +79,11 @@
%install
rm -rf $RPM_BUILD_ROOT
-
- # install LZMA from LZMA Utils
- ( cd lzma-%{V_lzmautils}
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- ) || 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/lzma-7z
-
- # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
