[arch-commits] Commit in flashplugin/repos (3 files)

[Pierre Schmitz]

    Date: Monday, November 17, 2008 @ 15:38:30
  Author: pierre
Revision: 19210

Merged revisions 19204,19208 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/flashplugin/trunk

........
  r19204 | pierre | 2008-11-17 21:10:28 +0100 (Mo, 17 Nov 2008) | 2 lines
  
  upgpkg: flashplugin 10.0.d20.7-3
      x86_64 has different pkgver (for now)
........
  r19208 | pierre | 2008-11-17 21:37:33 +0100 (Mo, 17 Nov 2008) | 1 line
  
  upgpkg: flashplugin 10.0.12.36-4
........

Modified:
  flashplugin/repos/testing-i686/	(properties)
  flashplugin/repos/testing-i686/PKGBUILD
  flashplugin/repos/testing-i686/flashplugin.install

---------------------+
 PKGBUILD            |    4 +++-
 flashplugin.install |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)


Property changes on: flashplugin/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /flashplugin/trunk:1-19201
   + /flashplugin/trunk:1-19208

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-11-17 20:38:22 UTC (rev 19209)
+++ testing-i686/PKGBUILD	2008-11-17 20:38:30 UTC (rev 19210)
@@ -2,7 +2,7 @@
 
 pkgname=flashplugin
 pkgver=10.0.12.36
-pkgrel=3
+pkgrel=4
 pkgdesc='Adobe Flash Player (downloads plugin on install)'
 arch=('i686' 'x86_64')
 depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'wget' 'libarchive')
@@ -12,7 +12,9 @@
 url='http://www.adobe.com/go/getflash'
 license=('GPL')
 _source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz')
+[ "$CARCH" = 'x86_64' ] && pkgver=10.0.d20.7
 [ "$CARCH" = 'x86_64' ] && _source=('http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.d20.7.linux-x86_64.so.tar.gz')
+
 install=flashplugin.install
 
 build() {

Modified: testing-i686/flashplugin.install
===================================================================
--- testing-i686/flashplugin.install	2008-11-17 20:38:22 UTC (rev 19209)
+++ testing-i686/flashplugin.install	2008-11-17 20:38:30 UTC (rev 19210)
@@ -2,7 +2,7 @@
 
 post_install() {
 	echo 'Downloading Flash Player...'
-	wget -T 10 -q -O - "${_source}" | bsdtar -x -o -f - -C usr/lib/mozilla/plugins/ libflashplayer.so \
+	wget -T 10 -q -O - "${_source}" | bsdtar --strip-components=1 -x -o -f - -C usr/lib/mozilla/plugins/ *libflashplayer.so \
 		|| echo 'Download failed. Please install again later.'
 }