Date: Wed, 21 Oct 2015 08:14:48 +0200
From: Natanael Copa <ncopa@alpinelinux.org>
To: =?ISO-8859-1?B?U/ZyZW4=?= Tempel <soeren+git@soeren-tempel.net>
Cc: alpine-aports@lists.alpinelinux.org
Subject: Re: [alpine-aports] [PATCH] main/xz: Install license to
 /usr/share/licenses
Message-ID: <20151021081448.07f7663d@ncopa-desktop.alpinelinux.org>
In-Reply-To: <1445206890-17914-1-git-send-email-soeren+git@soeren-tempel.net>
References: <1445206890-17914-1-git-send-email-soeren+git@soeren-tempel.net>
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On Mon, 19 Oct 2015 00:21:30 +0200
S=F6ren Tempel <soeren+git@soeren-tempel.net> wrote:

> ---
>  main/xz/APKBUILD | 35 +++++++++++++++++++----------------
>  1 file changed, 19 insertions(+), 16 deletions(-)
>=20
> diff --git a/main/xz/APKBUILD b/main/xz/APKBUILD
> index 803bdc1..cb71a37 100644
> --- a/main/xz/APKBUILD
> +++ b/main/xz/APKBUILD
> @@ -1,41 +1,44 @@
> +# Contributor: S=F6ren Tempel <soeren+alpine@soeren-tempel.net>
>  # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
>  pkgname=3Dxz
>  pkgver=3D5.2.2
> -pkgrel=3D0
> +pkgrel=3D1
>  pkgdesc=3D"Library and command line tools for XZ and LZMA compressed fil=
es"
>  url=3D"http://tukaani.org/xz/"
>  arch=3D"all"
> -license=3D"GPL LGPL custom"
> +license=3D"custom"

I don't like the "custom" license really. Fedora says:
GPLv2+ and Public Domain

http://pkgs.fedoraproject.org/cgit/xz.git/tree/xz.spec#n12

Can't we use that instead?

As example, it is not very simple to figure out what license unrar has:
https://pkgs.alpinelinux.org/packages?name=3Dunrar&repo=3Dall&arch=3Dx86_64=
&maintainer=3Dall

>  depends=3D""
>  makedepends=3D""
>  subpackages=3D"$pkgname-dev $pkgname-doc $pkgname-libs"
>  source=3D"http://tukaani.org/xz/xz-$pkgver.tar.gz"
> =20
>  _builddir=3D"$srcdir"/$pkgname-$pkgver
> -build ()=20
> -{=20
> -	cd $srcdir/$pkgname-$pkgver
> +build () {
> +	cd "$_builddir"
>  	./configure \
>  		--build=3D$CBUILD \
>  		--host=3D$CHOST \
>  		--prefix=3D/usr \
> +		--sysconfdir=3D/etc \
> +		--mandir=3D/usr/share/man \
> +		--infodir=3D/usr/share/info \
> +		--localstatedir=3D/var \

I don't think xz has any info pages or use localstatedir so i think
adding those is pointless.

>  		--disable-rpath \
>  		--disable-werror \
>  		|| return 1
> -	sed -i 's|^hardcode_libdir_flag_spec=3D.*|hardcode_libdir_flag_spec=3D"=
"|g' libtool
> -	sed -i 's|^runpath_var=3DLD_RUN_PATH|runpath_var=3DDIE_RPATH_DIE|g' lib=
tool
> -	make
> -}
> =20
> -package() {
> -	cd "$_builddir"
> -	make DESTDIR=3D"$pkgdir" install || return 1
> +	sed 's|^hardcode_libdir_flag_spec=3D.*|hardcode_libdir_flag_spec=3D""|g=
' \
> +		-i libtool || return 1
> +	sed 's|^runpath_var=3DLD_RUN_PATH|runpath_var=3DDIE_RPATH_DIE|g' \
> +		-i libtool || return 1
> +
> +	make || return 1
>  }
> =20
> -libs() {
> -	pkgdesc=3D"Libraries for decoding LZMA compression"
> -	mkdir -p "$subpkgdir"/usr/lib
> -	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
> +package() {
> +	make -C "$_builddir" DESTDIR=3D"$pkgdir" install || return 1
> +	install -Dm644 "$_builddir"/COPYING \
> +		"$pkgdir"/usr/share/licenses/$pkgname || return 1
>  }
> =20
>  md5sums=3D"7cf6a8544a7dae8e8106fdf7addfa28c  xz-5.2.2.tar.gz"



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---