From cce5ca5f2ba1dd050bff886be25aec2ca6617c6d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 26 Oct 2010 03:08:32 +0200 Subject: [PATCH] xz: update to 5.0.0, provide liblzma{,-devel} subpkgs. Bump abi_depends. --HG-- rename : srcpkgs/xz/xz-devel.template => srcpkgs/xz/liblzma-devel.template --- srcpkgs/liblzma | 1 + srcpkgs/liblzma-devel | 1 + srcpkgs/xz/depends | 2 +- srcpkgs/xz/liblzma-devel.template | 25 ++++++++++++++++++++++++ srcpkgs/xz/liblzma.template | 20 +++++++++++++++++++ srcpkgs/xz/template | 21 ++++++-------------- srcpkgs/xz/xz-devel.template | 21 -------------------- xbps-src/common/mapping_shlib_binpkg.txt | 2 +- 8 files changed, 55 insertions(+), 38 deletions(-) create mode 120000 srcpkgs/liblzma create mode 120000 srcpkgs/liblzma-devel create mode 100644 srcpkgs/xz/liblzma-devel.template create mode 100644 srcpkgs/xz/liblzma.template delete mode 100644 srcpkgs/xz/xz-devel.template diff --git a/srcpkgs/liblzma b/srcpkgs/liblzma new file mode 120000 index 00000000000..a162c286141 --- /dev/null +++ b/srcpkgs/liblzma @@ -0,0 +1 @@ +xz \ No newline at end of file diff --git a/srcpkgs/liblzma-devel b/srcpkgs/liblzma-devel new file mode 120000 index 00000000000..a162c286141 --- /dev/null +++ b/srcpkgs/liblzma-devel @@ -0,0 +1 @@ +xz \ No newline at end of file diff --git a/srcpkgs/xz/depends b/srcpkgs/xz/depends index ab6683c66b6..2ec6a7bd466 100644 --- a/srcpkgs/xz/depends +++ b/srcpkgs/xz/depends @@ -1,2 +1,2 @@ -abi_depends=">=4.999.9" +abi_depends=">=5.0.0" api_depends="${abi_depends}" diff --git a/srcpkgs/xz/liblzma-devel.template b/srcpkgs/xz/liblzma-devel.template new file mode 100644 index 00000000000..e230922b58c --- /dev/null +++ b/srcpkgs/xz/liblzma-devel.template @@ -0,0 +1,25 @@ +# Template file for 'liblzma-devel'. +# +short_desc="XZ-format compression library - development files" +long_desc=" + XZ is the successor to the Lempel-Ziv/Markov-chain Algorithm compression + format, which provides memory-hungry but powerful compression (often better + than bzip2) and fast, easy decompression. + + The native format of liblzma is XZ; it also supports raw (headerless) streams + and the older LZMA format used by lzma. + + This package contains files for development, headers, static libs, etc." + +replaces="xz-devel>=0" + +Add_dependency run glibc-devel +Add_dependency run liblzma + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/liblzma.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/xz/liblzma.template b/srcpkgs/xz/liblzma.template new file mode 100644 index 00000000000..5cc1bed4ebc --- /dev/null +++ b/srcpkgs/xz/liblzma.template @@ -0,0 +1,20 @@ +# Template file for 'liblzma'. +# +short_desc="XZ-format compression library" +long_desc=" + XZ is the successor to the Lempel-Ziv/Markov-chain Algorithm compression + format, which provides memory-hungry but powerful compression (often better + than bzip2) and fast, easy decompression. + + The native format of liblzma is XZ; it also supports raw (headerless) streams + and the older LZMA format used by lzma." + +replaces="xz<5.0.0" + +Add_dependency run glibc + +do_install() +{ + install -d ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/liblzma.so* ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template index b6c709c5b1e..b2b3a2ed7d3 100644 --- a/srcpkgs/xz/template +++ b/srcpkgs/xz/template @@ -1,13 +1,11 @@ # Template file for 'xz' pkgname=xz -version=4.999.9 -revision=2 -wrksrc=${pkgname}-${version}beta -distfiles="http://tukaani.org/xz/xz-${version}beta.tar.bz2" +version=5.0.0 +distfiles="http://tukaani.org/xz/xz-${version}.tar.bz2" build_style=gnu_configure short_desc="XZ utilities" maintainer="Juan RP " -checksum=330312c4397608d8b7be362cc7edbfeafa6101614bc2164d816ea767656aa15c +checksum=47a89e65c4690364a0123871a221e663d23a9fbd1ca756a804b10dd4006056d8 long_desc=" LZMA is a general purporse compression algorithm designed by Igor Pavlov as part of 7-Zip. It provides high compression ratio while @@ -19,20 +17,13 @@ long_desc=" of the most popular existing compression algorithms. XZ Utils consist of a few relatively separate parts: - * liblzma is an encoder/decoder library with support for several - filters (algorithm implementations). The primary filter is - LZMA. - * libzfile (or whatever the name will be) enables reading from - and writing to gzip, bzip2 and LZMA compressed and uncompressed - files with an API similar to the standard ANSI-C file I/O. - [ NOTE: libzfile is not implemented yet. ] * xz command line tool has almost identical syntax than gzip and bzip2. It makes LZMA easy for average users, but also provides advanced options to finetune the compression settings. * A few shell scripts make diffing and grepping LZMA compressed files easy. The scripts were adapted from gzip and bzip2." -replaces="lzma-utils>=0 lzma-utils-libs>=0" -subpackages="xz-devel" +subpackages="liblzma liblzma-devel" + Add_dependency run glibc -Add_dependency run libstdc++ +Add_dependency run liblzma diff --git a/srcpkgs/xz/xz-devel.template b/srcpkgs/xz/xz-devel.template deleted file mode 100644 index f669f6dd733..00000000000 --- a/srcpkgs/xz/xz-devel.template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'xz-devel'. -# -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -replaces="lzma-utils-devel>=0" -revision=2 - -Add_dependency run glibc-devel -Add_dependency run libstdc++-devel -Add_dependency run xz - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/liblzma.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib -} diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index 97ee2f04ad7..8da4d983194 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -161,7 +161,7 @@ libcrack.so cracklib cracklib-devel libpam.so pam pam-devel libpam_misc.so pam pam-devel libcap.so libcap libcap-devel -liblzma.so xz xz-devel +liblzma.so liblzma liblzma-devel libuuid.so libuuid libuuid-devel libblkid.so libblkid libblkid-devel libeinfo.so OpenRC OpenRC-devel