Date: Wednesday, December 9, 2009 @ 09:49:32 Author: giovanni Revision: 60915
Merged revisions 48118,53006,60911 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/flashplugin/trunk ........ r48118 | giovanni | 2009-07-31 04:35:38 -0700 (ven, 31 lug 2009) | 1 line upgpkg: flashplugin 10.0.32.18-1.1 ........ r53006 | eric | 2009-09-24 17:42:03 -0700 (gio, 24 set 2009) | 1 line fixed PKGBUILD sourcing ........ r60911 | andrea | 2009-12-09 03:51:09 -0800 (mer, 09 dic 2009) | 2 lines upgpkg: flashplugin 10.0.42.34-1 upstream release ........ Modified: flashplugin/repos/extra-x86_64/ (properties) flashplugin/repos/extra-x86_64/PKGBUILD ----------+ PKGBUILD | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) Property changes on: flashplugin/repos/extra-x86_64 ___________________________________________________________________ Modified: svnmerge-integrated - /flashplugin/trunk:1-48116 + /flashplugin/trunk:1-60914 Modified: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2009-12-09 12:03:35 UTC (rev 60914) +++ extra-x86_64/PKGBUILD 2009-12-09 14:49:32 UTC (rev 60915) @@ -1,40 +1,27 @@ # $Id$ +# Contributor: Andrea Scarpino <and...@archlinux.org> pkgname=flashplugin -_licensefile='Reader_Player_WWEULA-Combined-20060724_1430.pdf' -if [ "${CARCH}" = 'i686' ]; then - pkgver=10.0.32.18 - pkgrel=1 - source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz' - "http://www.adobe.com/products/eulas/pdfs/${_licensefile}") - md5sums=('23e4c2b844db0f87ff62084178aa2b1f' - '844cea6c9afc13d9e27f28ce1a6e20f3') -elif [ "${CARCH}" = 'x86_64' ]; then - pkgver=10.0.32.18 - pkgrel=1 - source=("http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${pkgver}.linux-x86_64.so.tar.gz" - "http://www.adobe.com/products/eulas/pdfs/${_licensefile}") - md5sums=('492d98d25886afcaf18252334d4ac4e2' - '844cea6c9afc13d9e27f28ce1a6e20f3') -fi +_licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf' +pkgver=10.0.42.34 +pkgrel=1 pkgdesc='Adobe Flash Player' -url='http://www.adobe.com/go/getflash' +url='http://get.adobe.com/flashplayer' arch=('i686' 'x86_64') depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl') replaces=('flashplugin-beta') provides=('flashplayer') license=('custom') +source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz' + "http://www.adobe.com/products/eulas/pdfs/${_licensefile}") +md5sums=('aa694c7392d4519e4ef7812fd2922730' + '1636037610ee2aa35c5fb736a697b7e0') +[ "${CARCH}" = "x86_64" ] && source[0]="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${pkgver}.linux-${CARCH}.so.tar.gz" +[ "${CARCH}" = "x86_64" ] && md5sums[0]='8b427c2991c0447af56a951c653ee383' build() { install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/ || return 1 - if [ "${CARCH}" = 'i686' ]; then - install -m755 ${srcdir}/install_flash_player_10_linux/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1 - elif [ "${CARCH}" = 'x86_64' ]; then - install -m755 ${srcdir}/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1 - fi + install -m755 ${srcdir}/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1 install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 - install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 + install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf || return 1 } - -md5sums=('332e60275e9c7a92059f286a2bad6e41' - '844cea6c9afc13d9e27f28ce1a6e20f3')