[Lunar-commits] r16900 - in moonbase/trunk/zbeta: opera opera-static

[Stefan Wold]

Author: ratler
Date: 2005-10-12 13:55:26 +0000 (Wed, 12 Oct 2005)
New Revision: 16900

Added:
   moonbase/trunk/zbeta/opera-static/DEPENDS
Modified:
   moonbase/trunk/zbeta/opera-static/BUILD
   moonbase/trunk/zbeta/opera/BUILD
   moonbase/trunk/zbeta/opera/DEPENDS
Log:
ElAngelo reported lunar fix problems. Opera comes with 3 different motifwrappers for libxm.so.1, libxm.so.2 and libxm.so.3. By adding lesstif as depend we now have libxm.so.2, the other 2 wrappers have been removed so lunar fix wont think opera is broken

Modified: moonbase/trunk/zbeta/opera/BUILD
===================================================================
--- moonbase/trunk/zbeta/opera/BUILD	2005-10-12 12:28:06 UTC (rev 16899)
+++ moonbase/trunk/zbeta/opera/BUILD	2005-10-12 13:55:26 UTC (rev 16900)
@@ -1,4 +1,9 @@
 (
+  # Remove operamotifwrappers that will fail ldd check on lunar fix
+  # Operas installer is smart enough to notice they are gone
+  rm -f $SOURCE_DIRECTORY/plugins/operamotifwrapper-1 &&
+  rm -f $SOURCE_DIRECTORY/plugins/operamotifwrapper-3 &&
+
   prepare_install &&
   echo "n" | ./install.sh -s &&
 

Modified: moonbase/trunk/zbeta/opera/DEPENDS
===================================================================
--- moonbase/trunk/zbeta/opera/DEPENDS	2005-10-12 12:28:06 UTC (rev 16899)
+++ moonbase/trunk/zbeta/opera/DEPENDS	2005-10-12 13:55:26 UTC (rev 16900)
@@ -1,2 +1,3 @@
 depends libstdc++5 &&
+depends lesstif &&
 depends qt3

Modified: moonbase/trunk/zbeta/opera-static/BUILD
===================================================================
--- moonbase/trunk/zbeta/opera-static/BUILD	2005-10-12 12:28:06 UTC (rev 16899)
+++ moonbase/trunk/zbeta/opera-static/BUILD	2005-10-12 13:55:26 UTC (rev 16900)
@@ -1,4 +1,9 @@
 (
+  # Remove operamotifwrappers that will fail ldd check on lunar fix
+  # Operas installer is smart enough to notice they are gone
+  rm -f $SOURCE_DIRECTORY/plugins/operamotifwrapper-1 &&
+  rm -f $SOURCE_DIRECTORY/plugins/operamotifwrapper-3 &&
+
   prepare_install &&
   echo "n" | ./install.sh -s &&
 

Added: moonbase/trunk/zbeta/opera-static/DEPENDS
===================================================================
--- moonbase/trunk/zbeta/opera-static/DEPENDS	2005-10-12 12:28:06 UTC (rev 16899)
+++ moonbase/trunk/zbeta/opera-static/DEPENDS	2005-10-12 13:55:26 UTC (rev 16900)
@@ -0,0 +1 @@
+depends lesstif