Update of /cvsroot/player/installer/rpm
In directory cvs-new:/tmp/cvs-serv9623/rpm

Modified Files:
      Tag: bingo-beta
	HelixPlayer.spec RealPlayer.spec 
Log Message:
CR rggammon
fix PR 2538 and 2606
try installing the plugin to some additional browser plugin directories
test for /opt/gnome/share/pixmaps instead of assuming it exists


Index: RealPlayer.spec
===================================================================
RCS file: /cvsroot/player/installer/rpm/RealPlayer.spec,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- RealPlayer.spec	7 Jul 2004 18:52:36 -0000	1.4.2.2
+++ RealPlayer.spec	9 Jul 2004 21:35:18 -0000	1.4.2.3
@@ -64,9 +64,11 @@
     done
 
     # setup mozilla
-    for MOZDIR in "/usr/lib/mozilla" ; do
-	ln -sf "$INSTDIR/mozilla/nphelix.so" "$MOZDIR/plugins"
-	ln -sf "$INSTDIR/mozilla/nphelix.xpt" "$MOZDIR/plugins"
+    for MOZDIR in "/usr/lib/mozilla/plugins" "/usr/lib/browser-plugins" "/opt/mozilla/lib/plugins"; do
+	if [ -d "$MOZDIR" ] ; then
+	    ln -sf "$INSTDIR/mozilla/nphelix.so" "$MOZDIR"
+	    ln -sf "$INSTDIR/mozilla/nphelix.xpt" "$MOZDIR"
+	fi
     done
 
     # find gnome, install desktop files
@@ -88,7 +90,8 @@
 
         # install icons
         PIXMAPS="$SHARE/pixmaps"
-        install -p -m644 "$INSTDIR/share/$TARGET.png" "$PIXMAPS"
+        test -d "$PIXMAPS" && \
+	    install -p -m644 "$INSTDIR/share/$TARGET.png" "$PIXMAPS"
         HICOLOR="$SHARE/icons/hicolor"
         if [ -d "$HICOLOR" ] ; then
             for SIZE in "16x16" "32x32" "48x48" "128x128" "192x192" ; do

Index: HelixPlayer.spec
===================================================================
RCS file: /cvsroot/player/installer/rpm/HelixPlayer.spec,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -d -r1.11.2.2 -r1.11.2.3
--- HelixPlayer.spec	7 Jul 2004 18:52:36 -0000	1.11.2.2
+++ HelixPlayer.spec	9 Jul 2004 21:35:18 -0000	1.11.2.3
@@ -61,9 +61,11 @@
     done
 
     # setup mozilla
-    for MOZDIR in "/usr/lib/mozilla" ; do
-	ln -sf "$INSTDIR/mozilla/nphelix.so" "$MOZDIR/plugins"
-	ln -sf "$INSTDIR/mozilla/nphelix.xpt" "$MOZDIR/plugins"
+    for MOZDIR in "/usr/lib/mozilla/plugins" "/usr/lib/browser-plugins" "/opt/mozilla/lib/plugins"; do
+	if [ -d "$MOZDIR" ] ; then
+	    ln -sf "$INSTDIR/mozilla/nphelix.so" "$MOZDIR"
+	    ln -sf "$INSTDIR/mozilla/nphelix.xpt" "$MOZDIR"
+	fi
     done
 
     # find gnome, install desktop files
@@ -85,7 +87,8 @@
 
         # install icons
         PIXMAPS="$SHARE/pixmaps"
-        install -p -m644 "$INSTDIR/share/hxplay.png" "$PIXMAPS"
+        test -d "$PIXMAPS" && \
+	    install -p -m644 "$INSTDIR/share/hxplay.png" "$PIXMAPS"
 
         HICOLOR="$SHARE/icons/hicolor"
         if [ -d "$HICOLOR" ] ; then