[svn] r4841 - in trunk: rpms/mplayerplug-in web/freshrpms.net/packages/lists

[packagers at lists.rpmforge.net]

Author: thias
Date: 2006-10-20 16:55:36 +0200 (Fri, 20 Oct 2006)
New Revision: 4841

Removed:
   trunk/rpms/mplayerplug-in/filter-depends.sh
Modified:
   trunk/rpms/mplayerplug-in/mplayerplug-in.spec
   trunk/web/freshrpms.net/packages/lists/fc6.txt
Log:
Fix mplayerplug-in on FC6 (rebuild against firefox) and update FC6 package list.


Deleted: trunk/rpms/mplayerplug-in/filter-depends.sh
===================================================================
--- trunk/rpms/mplayerplug-in/filter-depends.sh	2006-10-20 14:23:43 UTC (rev 4840)
+++ trunk/rpms/mplayerplug-in/filter-depends.sh	2006-10-20 14:55:36 UTC (rev 4841)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/usr/lib/rpm/find-requires $* | grep -v libxpcom.so
-

Modified: trunk/rpms/mplayerplug-in/mplayerplug-in.spec
===================================================================
--- trunk/rpms/mplayerplug-in/mplayerplug-in.spec	2006-10-20 14:23:43 UTC (rev 4840)
+++ trunk/rpms/mplayerplug-in/mplayerplug-in.spec	2006-10-20 14:55:36 UTC (rev 4841)
@@ -5,10 +5,12 @@
 
 #%define mversion %(rpm -q mozilla-devel --qf "%%{epoch}:%%{version}")
 
-%define _use_internal_dependency_generator 0
-
 %{?dist: %{expand: %%define %dist 1}}
 
+%define mozilla mozilla
+%{!?dist:%define mozilla firefox}
+%{?fc6:%define mozilla firefox}
+
 %{?el4:%define _without_modxorg 1}
 %{?el3:%define _without_modxorg 1}
 %{?el2:%define _without_modxorg 1}
@@ -20,7 +22,7 @@
 Summary: Browser plugin for MPlayer
 Name: mplayerplug-in
 Version: 3.31
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 URL: http://mplayerplug-in.sourceforge.net/
@@ -29,7 +31,7 @@
 Source10: filter-depends.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: mozilla-devel, gtk2-devel >= 2.2.1
+BuildRequires: %{mozilla}-devel, gtk2-devel >= 2.2.1
 BuildRequires: gcc-c++, gettext
 %{!?_without_modxorg:BuildRequires: libXt-devel, libXpm-devel}
 %{?_without_modxorg:BuildRequires: XFree86-devel}
@@ -39,10 +41,6 @@
 #Requires: %{_libdir}/mozilla/plugins/
 Requires: mplayer
 
-# We filter out the libxpcom.so requirement since firefox has it too although
-# it doesn't provide it (i.e. we let users have only firefox installed)
-%define __find_requires %{SOURCE10}
-
 %description
 mplayerplug-in is a browser plugin that uses mplayer to play videos
 in your browser.
@@ -79,6 +77,10 @@
 %{_libdir}/mozilla/plugins/mplayerplug-in-wmp.xpt
 
 %changelog
+* Fri Oct 20 2006 Matthias Saou <http://freshrpms.net/> 3.31-2
+- Pull in firefox instead of mozilla for FC6 and non-Fedora.
+- Remove the libxpcom.so filtering since firefox now provides it again.
+
 * Tue Aug 29 2006 Dag Wieers <dag at wieers.com> - 3.31-1
 - Updated to release 3.31.
 

Modified: trunk/web/freshrpms.net/packages/lists/fc6.txt
===================================================================
--- trunk/web/freshrpms.net/packages/lists/fc6.txt	2006-10-20 14:23:43 UTC (rev 4840)
+++ trunk/web/freshrpms.net/packages/lists/fc6.txt	2006-10-20 14:55:36 UTC (rev 4841)
@@ -39,8 +39,11 @@
 libquicktime *
 mjpegtools *
 cinelerra
+dkms-ipw3945 O
+dkms-lirc O
+dkms-ntfs O
+dkms-pwc O
 dkms-tiacx O
-dkms-ipw3945 O
 perl-AnyEvent o *
 perl-Coro *
 perl-Event-ExecFlow o *
@@ -51,9 +54,9 @@
 freshrpms-release o
 smpeg *
 frozen-bubble
-gaim-encryption
+gaim-encryption x (since last gaim update)
 glame x (undefined reference to GLAME_NEWCELL)
-gnuboy x (joystick.h on i386)
+gnuboy
 libdvdnav *
 libdvdcss *
 libdvdread *
@@ -61,7 +64,7 @@
 libmad *
 mpeg2dec *
 swfdec *
-gstreamer-ffmpeg x (X libs on i386)
+gstreamer-ffmpeg
 gstreamer-pitfdll
 libmms *
 gstreamer-plugins-bad
@@ -91,6 +94,7 @@
 mplayer
 mplayer-fonts O
 mplayer-skins O
+mplayerplug-in
 nvidia-x11-drv O
 ogle
 ogle_gui
@@ -102,6 +106,7 @@
 quake3
 rar O
 rte
+sdlmame
 SheepShaver
 snes9express
 snes9x x (C/C++ linkage declaration)
@@ -110,7 +115,7 @@
 unace O
 unrar
 vcdimager
-videolan-client
+vlc
 vobcopy
 xine-lib *
 xine