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

[Thomas Bächler]

    Date: Thursday, December 18, 2008 @ 08:23:43
  Author: thomas
Revision: 21950

Merged revisions 19208,19218,21949 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/flashplugin/trunk

........
  r19208 | pierre | 2008-11-17 21:37:33 +0100 (Mo, 17 Nov 2008) | 1 line
  
  upgpkg: flashplugin 10.0.12.36-4
........
  r19218 | pierre | 2008-11-17 22:10:53 +0100 (Mo, 17 Nov 2008) | 1 line
  
  increase timeout for Dale's broken DNS server
........
  r21949 | thomas | 2008-12-18 14:23:24 +0100 (Do, 18 Dez 2008) | 1 line
  
  upgpkg: flashplugin 10.0.d21.1-1
........

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

---------------------+
 PKGBUILD            |   45 +++++++++++++++++++++++++++++++--------------
 flashplugin.install |   15 ---------------
 2 files changed, 31 insertions(+), 29 deletions(-)


Property changes on: flashplugin/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /flashplugin/trunk:1-19204
   + /flashplugin/trunk:1-21949

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-12-18 13:23:24 UTC (rev 21949)
+++ testing-x86_64/PKGBUILD	2008-12-18 13:23:43 UTC (rev 21950)
@@ -1,23 +1,40 @@
 # $Id$
 
 pkgname=flashplugin
-pkgver=10.0.12.36
-pkgrel=3
-pkgdesc='Adobe Flash Player (downloads plugin on install)'
+_licensefile='Reader_Player_WWEULA-Combined-20060724_1430.pdf'
+if [ "${CARCH}" = 'i686' ]; then
+  pkgver=10.0.15.3
+  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=('afab0b40b0ae11445e2e90a4a9224a8a'
+           '844cea6c9afc13d9e27f28ce1a6e20f3')
+elif [ "${CARCH}" = 'x86_64' ]; then
+  pkgver=10.0.d21.1
+  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=('c165af9d4e324bfaf6d1cfbdbe959fbb'
+           '844cea6c9afc13d9e27f28ce1a6e20f3')
+else
+  error Unknown architecture.
+  exit 1
+fi
+pkgdesc='Adobe Flash Player'
+url='http://www.adobe.com/go/getflash'
 arch=('i686' 'x86_64')
-depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'wget' 'libarchive')
+depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl')
 replaces=('flashplugin-beta')
-conflicts=('nspluginwrapper')
 provides=('flashplayer')
-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')
+license=('custom')
 
-install=flashplugin.install
-
 build() {
-	sed -r "s|_source=.*|_source='${_source}'|g" -i ${startdir}/flashplugin.install
-	install -d ${pkgdir}/usr/lib/mozilla/plugins
+  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 -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+  install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }

Deleted: testing-x86_64/flashplugin.install
===================================================================
--- testing-x86_64/flashplugin.install	2008-12-18 13:23:24 UTC (rev 21949)
+++ testing-x86_64/flashplugin.install	2008-12-18 13:23:43 UTC (rev 21950)
@@ -1,15 +0,0 @@
-_source='http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.d20.7.linux-x86_64.so.tar.gz'
-
-post_install() {
-	echo 'Downloading Flash Player...'
-	wget -T 10 -q -O - "${_source}" | bsdtar -x -o -f - -C usr/lib/mozilla/plugins/ libflashplayer.so \
-		|| echo 'Download failed. Please install again later.'
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	rm -f usr/lib/mozilla/plugins/libflashplayer.so	
-}