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

Modified Files:
      Tag: bingo-beta
	HelixPlayer.spec RealPlayer.spec Umakefil 
Log Message:
Backporting bug fixes


Index: Umakefil
===================================================================
RCS file: /cvsroot/player/installer/rpm/Umakefil,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -d -r1.3.2.4 -r1.3.2.5
--- Umakefil	12 Jul 2004 20:43:23 -0000	1.3.2.4
+++ Umakefil	15 Jul 2004 02:02:45 -0000	1.3.2.5
@@ -60,7 +60,7 @@
 
 # XXXNH: a bit of a hack, but if we build for i586 we want to use that arch,
 # not the i386 reported by sysinfo.arch
-if sysinfo.distribution_id.find("i586"):
+if string.find(sysinfo.distribution_id,"i586"):
     target = "i586"
 else:
     target = sysinfo.arch

Index: RealPlayer.spec
===================================================================
RCS file: /cvsroot/player/installer/rpm/RealPlayer.spec,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -d -r1.4.2.4 -r1.4.2.5
--- RealPlayer.spec	13 Jul 2004 19:49:27 -0000	1.4.2.4
+++ RealPlayer.spec	15 Jul 2004 02:02:45 -0000	1.4.2.5
@@ -91,7 +91,7 @@
         # install icons
         PIXMAPS="$SHARE/pixmaps"
         test -d "$PIXMAPS" && \
-	    install -p -m644 "$INSTDIR/share/$TARGET.png" "$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
@@ -106,6 +106,10 @@
 
                 for MIME in \
                     "application-generic" \
+                    "audio-generic"       \
+                    "text-realtext"       \
+                    "video-generic"       \
+                    "video-ogg"           \
                     "application-ogg"     \
                     "application-ram"     \
                     "application-rpm"     \
@@ -135,7 +139,7 @@
 
 %postun
 if [ "$1" = 0 ] ; then
-(
+( 
     APPNAME=RealPlayer
     TARGET=realplay
     INSTDIR="$RPM_INSTALL_PREFIX/$APPNAME"

Index: HelixPlayer.spec
===================================================================
RCS file: /cvsroot/player/installer/rpm/HelixPlayer.spec,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -d -r1.11.2.4 -r1.11.2.5
--- HelixPlayer.spec	13 Jul 2004 19:49:27 -0000	1.11.2.4
+++ HelixPlayer.spec	15 Jul 2004 02:02:45 -0000	1.11.2.5
@@ -88,7 +88,7 @@
         # install icons
         PIXMAPS="$SHARE/pixmaps"
         test -d "$PIXMAPS" && \
-	    install -p -m644 "$INSTDIR/share/hxplay.png" "$PIXMAPS"
+        install -p -m644 "$INSTDIR/share/hxplay.png" "$PIXMAPS"
 
         HICOLOR="$SHARE/icons/hicolor"
         if [ -d "$HICOLOR" ] ; then
@@ -104,6 +104,11 @@
 
                 for MIME in \
                     "application-generic" \
+                    "audio-generic"       \
+                    "text-realtext"       \
+                    "video-generic"       \
+                    "video-ogg"           \
+                    "application-ogg"     \
                     "application-ogg"     \
                     "application-ram"     \
                     "application-rpm"     \