Fix the license kerfuffle

This commit is contained in:
Andrés Rodríguez
2019-11-20 11:26:03 -03:00
parent a709033ac6
commit caeaf03625
2 changed files with 9 additions and 10 deletions

View File

@@ -1,11 +1,13 @@
pkgbase = brave-bin
pkgdesc = Web browser that blocks ads and trackers by default (binary release).
pkgver = 1.0.1
pkgrel = 1
pkgrel = 2
epoch = 1
url = https://brave.com/download
arch = x86_64
license = custom
license = MPL2
license = BSD
license = custom:chromium
depends = gtk3
depends = nss
depends = alsa-lib
@@ -20,12 +22,10 @@ pkgbase = brave-bin
noextract = brave-bin-1.0.1.zip
options = !strip
source = brave-bin-1.0.1.zip::https://github.com/brave/brave-browser/releases/download/v1.0.1/brave-v1.0.1-linux-x64.zip
source = MPL2::https://raw.githubusercontent.com/brave/brave-browser/master/LICENSE
source = brave-bin.sh
source = brave-browser.desktop
source = logo.png
sha512sums = 5384900f5e6e9f20ddffebdc288ffa9663654bcb28613d40f4fa68da3180bfce01e3671e9c39fdb97df621bca17f01f0ef211088695e0748d2a498dcd7e48020
sha512sums = 239dbc27d68e0a03e92c68fb746602d8183084c9624a533fe92a991b8a4658d5154c901ff64826992eabcf89a5b52cb32f9cf29fd25a42bef2b5d3932010d806
sha512sums = 2e80e926bba79830cb0e6780d028edfc7a80b5fe81880224c1e2c31329353081f9970ba8755f9003b106a3247b26861f80a3e3ac8731e0bf3c5d515eecca60eb
sha512sums = c21aecaafec43bc1ce1ea3439667efb4c7ea5e54bfa87346a9ae9650de1e90c80174b1610a9216f936f693593816c9585c6be1875b3bd318d067079c06251e92
sha512sums = d7bef52e336bd908d24bf3a084a1fc480831d27a3c80af4c31872465b6a0ce39bdf298e620ae9865526c974465807559cc75610b835e60b4358f65a8a8ff159e

View File

@@ -9,12 +9,12 @@
pkgname=brave-bin
pkgver=1.0.1
pkgrel=1
pkgrel=2
epoch=1
pkgdesc="Web browser that blocks ads and trackers by default (binary release)."
arch=("x86_64")
url="https://brave.com/download"
license=("custom")
license=("MPL2" "BSD" "custom:chromium")
depends=("gtk3" "nss" "alsa-lib" "libxss" "ttf-font")
optdepends=("cups: Printer support"
"pepper-flash: Adobe Flash support"
@@ -22,13 +22,11 @@ optdepends=("cups: Printer support"
provides=("${pkgname%-bin}" "brave-browser")
conflicts=("${pkgname%-bin}")
source=("$pkgname-$pkgver.zip::https://github.com/brave/brave-browser/releases/download/v${pkgver}/brave-v${pkgver}-linux-x64.zip"
"MPL2::https://raw.githubusercontent.com/brave/brave-browser/master/LICENSE"
"$pkgname.sh"
"brave-browser.desktop"
"logo.png")
options=(!strip)
sha512sums=("5384900f5e6e9f20ddffebdc288ffa9663654bcb28613d40f4fa68da3180bfce01e3671e9c39fdb97df621bca17f01f0ef211088695e0748d2a498dcd7e48020"
"239dbc27d68e0a03e92c68fb746602d8183084c9624a533fe92a991b8a4658d5154c901ff64826992eabcf89a5b52cb32f9cf29fd25a42bef2b5d3932010d806"
"2e80e926bba79830cb0e6780d028edfc7a80b5fe81880224c1e2c31329353081f9970ba8755f9003b106a3247b26861f80a3e3ac8731e0bf3c5d515eecca60eb"
"c21aecaafec43bc1ce1ea3439667efb4c7ea5e54bfa87346a9ae9650de1e90c80174b1610a9216f936f693593816c9585c6be1875b3bd318d067079c06251e92"
"d7bef52e336bd908d24bf3a084a1fc480831d27a3c80af4c31872465b6a0ce39bdf298e620ae9865526c974465807559cc75610b835e60b4358f65a8a8ff159e")
@@ -49,6 +47,7 @@ package() {
install -Dm0755 "$pkgname.sh" "$pkgdir/usr/bin/brave"
install -Dm0644 -t "$pkgdir/usr/share/applications" "brave-browser.desktop"
install -Dm0644 "logo.png" "$pkgdir/usr/share/pixmaps/brave.png"
install -Dm0664 -t "$pkgdir/usr/share/licenses/$pkgname" "MPL2"
mv "$pkgdir/usr/lib/$pkgname/"{LICENSE,LICENSES.chromium.html} "$pkgdir/usr/share/licenses/$pkgname"
LICENSES_DIR="$pkgdir/usr/share/licenses/$pkgname"
mkdir -p "$LICENSES_DIR"
mv "$pkgdir/usr/lib/$pkgname/"{LICENSE,LICENSES.chromium.html} "$LICENSES_DIR"
}