From 27e535ffa9a0c3d4f2990c8b7328a1f97a4bed32 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 17 Nov 2009 20:11:51 +0100 Subject: [PATCH] adobe-flash-plugin: update to the 10.1 beta version. Also put the EULA file into distfiles and improve the build template in general. --HG-- extra : convert_revision : 3b69a781a1b885a433c39c899553e0a721ef65dc --- templates/adobe-flash-plugin/template | 40 ++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/templates/adobe-flash-plugin/template b/templates/adobe-flash-plugin/template index ebf4cce09ba..d62e71734ba 100644 --- a/templates/adobe-flash-plugin/template +++ b/templates/adobe-flash-plugin/template @@ -1,15 +1,21 @@ # Template file for 'adobe-flash-plugin' pkgname=adobe-flash-plugin -version=10.0.32.18 +version=10.1beta +# The EULA file +_eula="http://www.adobe.com/products/eulas/pdfs/Reader_Player_WWEULA-Combined-20060724_1430.pdf" +_eulacksum=986c3ddacfee18946fbef7b76485922f8f36e61f790776ce82a87afff3008427 if [ "$xbps_machine" = "x86_64" ]; then - distfiles="http://download.macromedia.com/pub/labs/flashplayer10" - distfiles="${distfiles}/libflashplayer-${version}.linux-x86_64.so.tar.gz" - checksum=fc423a7ffa3e45208274c9b4a6af361e7e06dff1c2d582c9d80253a8b61cd300 + # FIXME: not yet updated, update ${_disttarball} and add missing + # ${_distcksum} if fixing for x86_64. + _disttarball="http://download.macromedia.com/pub/labs/flashplayer10" + _disttarball="${_disttarball}/libflashplayer-${version}.linux-x86_64.so.tar.gz" else - distfiles="http://fpdownload.macromedia.com/get/flashplayer" - distfiles="${distfiles}/current/install_flash_player_10_linux.tar.gz" - checksum=88aea5d73c5be37328a388630f8b89c256235c4f8337eef15ed523bbe3e5dada + _disttarball="http://download.macromedia.com/pub/labs/flashplayer10" + _disttarball="${_disttarball}/flashplayer10_1_p1_linux_111709.tar.gz" + _distcksum="b63cf3b98370c4ead94ad9ce81697c4f288bddd29118e47455f36446b3239b70" fi +distfiles="${_eula} ${_disttarball}" +checksum="${_eulacksum} ${_distcksum}" noextract=yes build_style=custom-install short_desc="Adobe Flash Player plugin" @@ -34,16 +40,12 @@ Add_dependency full nss do_install() { - local license="Reader_Player_WWEULA-Combined-20060724_1430.pdf" - - set -e - ( cd ${wrksrc}; \ - msg_normal "Fetching License..." - $XBPS_FETCH_CMD http://www.adobe.com/products/eulas/pdfs/${license} ; \ - install -d ${DESTDIR}/usr/lib/mozilla/plugins \ - ${DESTDIR}/usr/share/doc/${pkgname}; \ - tar xfz "${XBPS_SRCDISTDIR}/$(basename ${distfiles})" \ - -C ${DESTDIR}/usr/lib/mozilla/plugins; \ - chmod 755 ${DESTDIR}/usr/lib/mozilla/plugins; \ - mv ${wrksrc}/${license} ${DESTDIR}/usr/share/doc/${pkgname} ) + cd ${wrksrc} || retuyrn 1 + install -d ${DESTDIR}/usr/lib/mozilla/plugins \ + ${DESTDIR}/usr/share/doc/${pkgname} || return 1 + tar xfz "${XBPS_SRCDISTDIR}/$(basename ${_disttarball})" || return 1 + install -m755 install_flash_player_10_linux/libflashplayer.so \ + ${DESTDIR}/usr/lib/mozilla/plugins || return 1 + install -m644 "${XBPS_SRCDISTDIR}/$(basename ${_eula})" \ + ${DESTDIR}/usr/share/doc/${pkgname} || return 1 }