[Lunar-commits] <moonbase> flash-plugin-11: Got tired of seeing the warning about unable to preservice

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Sat Nov 12 15:30:09 CET 2011


commit 89d285f4255c560c7ecc2432fb42eefc2e7d64a7
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sat Nov 12 09:30:09 2011 -0500

    flash-plugin-11: Got tired of seeing the warning about unable to preservice
    
    ownership of some files. Also its kdelibs, not kdelibs4. Lastly, there is a
    usr/lib64/ that will try to be copied but fails so need to account for the
    differences between their x86 and x86_64 tarballs.
---
 web/flash-plugin-11/BUILD |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/web/flash-plugin-11/BUILD b/web/flash-plugin-11/BUILD
index 60dc372..202bf0c 100644
--- a/web/flash-plugin-11/BUILD
+++ b/web/flash-plugin-11/BUILD
@@ -1,13 +1,24 @@
 (
 
   # This only applies if you do not have kdelibs4/Qt4 installed.
-  if ! module_installed kdelibs4 ; then
-     rm -rf usr/lib/kde4 usr/share/kde4
+  if ! module_installed kdelibs ; then
+     rm -rf usr/lib64/kde4 usr/share/kde4
   fi &&
 
   prepare_install &&
   install -Dm755 libflashplayer.so /opt/lunar/plugins/libflashplayer.so &&
-  cp -af usr / &&
+  install -m755 usr/bin/flash-player-properties /usr/bin &&
+  install -m755 usr/share/pixmaps/flash-player-properties.png /usr/share/pixmaps/ &&
+  install -m755 usr/share/applications/flash-player-properties.desktop /usr/share/applications/ &&
+  cp -af usr/share/icons /usr/share/icons/ &&
+
+  if module_installed kdelibs && [ `arch` == "x86_64" ] ; then
+    cp -af usr/share/kde4/services / &&
+    cp -af usr/lib64/* /usr/lib/kde4/
+   else
+    cp -af usr/share/kde4/services / &&
+    cp -af usr/lib/* /usr/lib/kde4/
+  fi &&
 
   if [ -x /usr/bin/gtk-update-icon-cache -a -f /usr/share/icons/hicolor/index.theme ]; then
       gtk-update-icon-cache -f /usr/share/icons/hicolor


More information about the Lunar-commits mailing list