Date: Saturday, March 31, 2012 @ 08:48:19 Author: pierre Revision: 154939
db-move: moved xz from [testing] to [core] (x86_64) Added: xz/repos/core-x86_64/PKGBUILD (from rev 154937, xz/repos/testing-x86_64/PKGBUILD) xz/repos/core-x86_64/compile-fix.patch (from rev 154937, xz/repos/testing-x86_64/compile-fix.patch) Deleted: xz/repos/core-x86_64/PKGBUILD xz/repos/testing-x86_64/ -------------------+ PKGBUILD | 85 +++++++++++++++++++++++++--------------------------- compile-fix.patch | 28 +++++++++++++++++ 2 files changed, 70 insertions(+), 43 deletions(-) Deleted: core-x86_64/PKGBUILD =================================================================== --- core-x86_64/PKGBUILD 2012-03-31 12:48:18 UTC (rev 154938) +++ core-x86_64/PKGBUILD 2012-03-31 12:48:19 UTC (rev 154939) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> -# Contributor: François Charette <firmi...@gmx.net> - -pkgname=xz -pkgver=5.0.3 -pkgrel=1 -pkgdesc='Library and command line tools for XZ and LZMA compressed files' -arch=('i686' 'x86_64') -url='http://tukaani.org/xz/' -license=('GPL' 'LGPL' 'custom') -depends=('sh') -provides=('lzma' 'lzma-utils' 'xz-utils') -replaces=('lzma' 'lzma-utils' 'xz-utils') -conflicts=('lzma' 'lzma-utils' 'xz-utils') -options=('!libtool') -source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('fefe52f9ecd521de2a8ce38c21a27574') - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr \ - --disable-rpath \ - --enable-werror - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -d -m755 ${pkgdir}/usr/share/licenses/xz/ - ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/ - ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2 -} Copied: xz/repos/core-x86_64/PKGBUILD (from rev 154937, xz/repos/testing-x86_64/PKGBUILD) =================================================================== --- core-x86_64/PKGBUILD (rev 0) +++ core-x86_64/PKGBUILD 2012-03-31 12:48:19 UTC (rev 154939) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> +# Contributor: François Charette <firmi...@gmx.net> + +pkgname=xz +pkgver=5.0.3 +pkgrel=2 +pkgdesc='Library and command line tools for XZ and LZMA compressed files' +arch=('i686' 'x86_64') +url='http://tukaani.org/xz/' +license=('GPL' 'LGPL' 'custom') +depends=('sh') +options=('!libtool') +source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig" + 'compile-fix.patch') +md5sums=('fefe52f9ecd521de2a8ce38c21a27574' + 'd0725667a6dae0853194dc691e900e26' + 'b74e4f7793848cc5765c848ea30f971f') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/compile-fix.patch + + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-werror + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/licenses/xz/ + ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/ + ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2 +} Copied: xz/repos/core-x86_64/compile-fix.patch (from rev 154937, xz/repos/testing-x86_64/compile-fix.patch) =================================================================== --- core-x86_64/compile-fix.patch (rev 0) +++ core-x86_64/compile-fix.patch 2012-03-31 12:48:19 UTC (rev 154939) @@ -0,0 +1,28 @@ +From 7db6bdf4abcf524115be2cf5659ed540cef074c5 Mon Sep 17 00:00:00 2001 +From: Lasse Collin <lasse.col...@tukaani.org> +Date: Tue, 10 Jan 2012 17:13:03 +0200 +Subject: [PATCH] Tests: Fix a compiler warning with _FORTIFY_SOURCE. + +Reported here: +http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/4927385 +--- + tests/create_compress_files.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/tests/create_compress_files.c b/tests/create_compress_files.c +index 44367d8..bd5b4ef 100644 +--- a/tests/create_compress_files.c ++++ b/tests/create_compress_files.c +@@ -79,7 +79,8 @@ static void + write_abc(FILE *file) + { + for (size_t i = 0; i < 12345; ++i) +- fwrite("abc\n", 4, 1, file); ++ if (fwrite("abc\n", 4, 1, file) != 1) ++ exit(1); + } + + +-- +1.7.6 +