[Lunar-commits] <moonbase> flash-plugin-10: fix for previous fix Previous fix worked this way: If you do not have kde4 do not install control panel for flash. This fix works this way: If you do not have kde4 do not install kde4 flash control panel and icon. But install control panel and icons for other dektop managers like gnome for example.

[Zbigniew Luszpinski]

commit dbb45d0d67323ce1b362cf247bb2999e8459a29a
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat Apr 30 05:38:22 2011 +0200

    flash-plugin-10: fix for previous fix
    Previous fix worked this way:
    If you do not have kde4 do not install control panel for flash.
    This fix works this way:
    If you do not have kde4 do not install kde4 flash control panel
    and icon. But install control panel and icons for other dektop
    managers like gnome for example.
---
 web/flash-plugin-10/BUILD |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/flash-plugin-10/BUILD b/web/flash-plugin-10/BUILD
index 8329a61..43860c2 100644
--- a/web/flash-plugin-10/BUILD
+++ b/web/flash-plugin-10/BUILD
@@ -1,5 +1,10 @@
 (
 
+  # This only applies if you do not have kdelibs4/Qt4 installed.
+  if ! module_installed kdelibs4 ; then
+     rm -rf usr/lib/kde4 usr/share/kde4
+  fi &&
+
   prepare_install &&
   install -Dm755 libflashplayer.so /opt/lunar/plugins/libflashplayer.so &&
 
@@ -14,9 +19,6 @@
     fi
   fi &&
 
-# This only applies if you have qt4/kdelibs4 installed.
-  if module_installed kdelibs4 ; then
-    cp -a usr /
-  fi
+  cp -a usr /
 
 ) > $C_FIFO 2>&1