# HG changeset patch
# User Rohit Joshi <jozee@slitaz.org>
# Date 1267629277 0
# Node ID 304f0ecf5cd12aedcea4a7297bba833ba1f96094
# Parent  9b1b236344a682c730c131b181d481f3133ef6f5
get-flash-plugin: libfirefox dep; improve for midori and opera

diff -r 9b1b236344a6 -r 304f0ecf5cd1 get-flash-plugin/receipt
--- a/get-flash-plugin/receipt	Wed Mar 03 15:11:46 2010 +0000
+++ b/get-flash-plugin/receipt	Wed Mar 03 15:14:37 2010 +0000
@@ -1,12 +1,13 @@
 # SliTaz package receipt.
 
 PACKAGE="get-flash-plugin"
-VERSION="1.1"
+VERSION="1.2"
 CATEGORY="non-free"
 SHORT_DESC="Get Adobe Flash Player."
 MAINTAINER="pascal.bellard@slitaz.org"
 WEB_SITE="http://www.adobe.com/products/flash/"
-DEPENDS="firefox"
+DEPENDS="libfirefox"
+TAGS="flash"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 9b1b236344a6 -r 304f0ecf5cd1 get-flash-plugin/stuff/get-flash-plugin
--- a/get-flash-plugin/stuff/get-flash-plugin	Wed Mar 03 15:11:46 2010 +0000
+++ b/get-flash-plugin/stuff/get-flash-plugin	Wed Mar 03 15:14:37 2010 +0000
@@ -67,13 +67,6 @@
 mkdir -p $dir
 mv libflashplayer.so $dir
 
-# Export firefox libraries
-dir=flash-plugin-$VERSION/fs/usr/lib
-mkdir -p $dir
-for i in /usr/lib/firefox*/*.so ; do
-	[ -f $i ] && ln -s $i $dir
-done
-
 # Create pseudo package
 cat > flash-plugin-$VERSION/receipt <<EOT
 PACKAGE="flash-plugin"
@@ -81,7 +74,7 @@
 CATEGORY="non-free"
 SHORT_DESC="Adobe Flash Player."
 WEB_SITE="$WEB_SITE"
-DEPENDS="firefox curl atk cairo expat fontconfig freetype glib gtk+ libpng \
+DEPENDS="libfirefox curl atk cairo expat fontconfig freetype glib gtk+ libpng \
 pango pixman xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \
 xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
 xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXt zlib"
@@ -89,15 +82,21 @@
 post_install()
 {
 	echo -n "Processing post install commands..."
-	ln -s /usr/share/flash/libflashplayer.so \$1/usr/lib/firefox*/plugins
-	[ -d \$1/usr/lib/mozilla/plugins ] || ln -s /usr/share/flash/libflashplayer.so \$1/usr/lib/mozilla/plugins
+	if [ -d /var/lib/tazpkg/installed/firefox ] ; then
+		ln -s /usr/share/flash/libflashplayer.so \$1/usr/lib/firefox*/plugins
+	fi	 
+	mkdir -p \$1/usr/lib/mozilla/plugins
+	ln -s /usr/share/flash/libflashplayer.so \$1/usr/lib/mozilla/plugins
 	status
 }
 
 post_remove()
 {
 	echo -n "Processing post remove commands..."
-	rm -f /usr/lib/firefox*/plugins/libflashplayer.so
+	if [ -d /var/lib/tazpkg/installed/firefox ] ; then
+		rm -f /usr/lib/firefox*/plugins/libflashplayer.so
+	fi
+	rm -f /usr/lib/mozilla/plugins/libflashplayer.so
 	status
 }
 EOT