Merge branch '2.6' into 2.7

Conflicts:
	flash-player-plugin/Pkgfile
This commit is contained in:
Jose V Beneyto 2010-10-07 21:52:11 +02:00
commit 8b32213a00
4 changed files with 8 additions and 9 deletions

View File

@ -1 +1 @@
fc5acf558e2817f2c633a075a398b26b AdbeRdr9.3.4-1_i486linux_enu.tar.bz2
dd7a47695fb149c09dcda65c754708cb AdbeRdr9.4-1_i486linux_enu.tar.bz2

View File

@ -5,9 +5,9 @@
# Depends on: gtk libstdc++-compat
name=adobereader
version=9.3.4
version=9.4.0
release=1
source=(ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/$version/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2)
source=(ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/$version/enu/AdbeRdr${version%.*}-1_i486linux_enu.tar.bz2)
PKGMK_NO_STRIP="yes"
build() {

View File

@ -1 +1 @@
3f250cc33acac7a600fca60ac834455c flash-plugin-10.1.82.76-release.i386.rpm
d3d8f82384325c2adfb4cfd5ef173d7f install_flash_player_10_linux.tar.gz

View File

@ -5,11 +5,10 @@
# Depends on:
name=flash-player-plugin
version=10.1.82.76
release=3
source=(http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-$version-release.i386.rpm)
version=10.1.85.3
release=1
source=(http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz)
build() {
install -D -m 0755 usr/lib/flash-plugin/libflashplayer.so \
$PKG/usr/lib/mozilla/plugins/libflashplayer.so
install -D -m 0755 libflashplayer.so $PKG/usr/lib/mozilla/plugins/libflashplayer.so
}