SPECS: browser-plugin-kaffeine.spec - does it really conflict with...

[glen]

Author: glen                         Date: Wed Sep 13 16:26:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- does it really conflict with mplayerplug-in?

---- Files affected:
SPECS:
   browser-plugin-kaffeine.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/browser-plugin-kaffeine.spec
diff -u SPECS/browser-plugin-kaffeine.spec:1.2 SPECS/browser-plugin-kaffeine.spec:1.3
--- SPECS/browser-plugin-kaffeine.spec:1.2	Wed Sep 13 18:24:39 2006
+++ SPECS/browser-plugin-kaffeine.spec	Wed Sep 13 18:26:14 2006
@@ -18,7 +18,6 @@
 BuildRequires:	xorg-lib-libXaw-devel
 BuildRequires:	xorg-lib-libXt-devel
 Requires:	browser-plugins(%{_target_base_arch})
-Conflicts:	mplayerplug-in
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # directory where you store the plugin
@@ -34,7 +33,8 @@
 Supported browsers: %{browsers}.
 
 %description -l pl
-Ta paczka dostarcza wtyczki odtwarzacza wideo/audio dla przeglądarek internetowych.
+Ta paczka dostarcza wtyczki odtwarzacza wideo/audio dla przeglądarek
+internetowych.
 
 Obsługiwane przeglądarki: %{browsers}.
 
@@ -100,6 +100,9 @@
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 $Log$
+Revision 1.3  2006/09/13 16:26:14  glen
+- does it really conflict with mplayerplug-in?
+
 Revision 1.2  2006/09/13 16:24:39  glen
 - copied too much?
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/browser-plugin-kaffeine.spec?r1=1.2&r2=1.3&f=u