From de77ad088f2aeddff4e5edc72cc22d607a8100b1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 13 Dec 2014 18:33:42 +0100 Subject: [PATCH] chromium-pepper-flash: fixing download --- srcpkgs/chromium-pepper-flash/files/LICENSE | 1 + srcpkgs/chromium-pepper-flash/template | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/chromium-pepper-flash/files/LICENSE diff --git a/srcpkgs/chromium-pepper-flash/files/LICENSE b/srcpkgs/chromium-pepper-flash/files/LICENSE new file mode 100644 index 00000000000..03f10f28718 --- /dev/null +++ b/srcpkgs/chromium-pepper-flash/files/LICENSE @@ -0,0 +1 @@ +see http://www.google.com/chrome/intl/en/eula_text.html diff --git a/srcpkgs/chromium-pepper-flash/template b/srcpkgs/chromium-pepper-flash/template index a3b648a648a..c173c7838a7 100644 --- a/srcpkgs/chromium-pepper-flash/template +++ b/srcpkgs/chromium-pepper-flash/template @@ -18,19 +18,18 @@ create_wrksrc=yes case "${XBPS_TARGET_MACHINE}" in x86_64) _filename=google-chrome-${_channel}_${_chromeVersion}_amd64.deb - _chromeChecksum+=" 8f5c0a5a4f602272fee1774c54525ab673e3c5d77d4fb7fdc9637acd7fd343a0" + _chromeChecksum="8f5c0a5a4f602272fee1774c54525ab673e3c5d77d4fb7fdc9637acd7fd343a0" ;; i686) _filename=google-chrome-${_channel}_${_chromeVersion}_i386.deb - _chromeChecksum+=" 3164b563a5520707ddbab06312015254aab54bdf0b54d0e82dc5ca6f0bb506da" + _chromeChecksum="3164b563a5520707ddbab06312015254aab54bdf0b54d0e82dc5ca6f0bb506da" ;; esac _chromeUrl="${_baseUrl}/${_filename}" -distfiles="http://www.google.com/chrome/intl/en/eula_text.html>license.html ${_chromeUrl}" -checksum="8dd9b0034b69d523eab459ee3b00379421e4e41b780014b0345aba5697a86bc4 - $_chromeChecksum" +distfiles="${_chromeUrl}" +checksum="${_chromeChecksum}" -skip_extraction="license.html $_filename" +skip_extraction="$_filename" do_build() { sed \ @@ -46,7 +45,7 @@ do_install() { vmkdir "usr/lib/chromium-pepper-flash" vcopy chromium-pepper-vars.sh "usr/lib/chromium-pepper-flash" - vinstall "${XBPS_SRCDISTDIR}/$pkgname-$version/license.html" 644 "usr/share/licenses/chromium-pepper-flash" + vinstall "${FILESDIR}/LICENSE" 644 "usr/share/licenses/chromium-pepper-flash" vmkdir "etc/profile.d" vinstall "chromium-pepper-flash.sh" 644 "etc/profile.d"