From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 13 Sep 2006 16:26:14 +0000 (+0000)
Subject: - does it really conflict with mplayerplug-in?
X-Git-Tag: auto/ti/browser-plugin-kaffeine-0_2-1~6
X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=b9023dce6386ada1b654bbf0ae4ce7e1224dc169;p=packages%2Fbrowser-plugin-kaffeine.git

- does it really conflict with mplayerplug-in?

Changed files:
    browser-plugin-kaffeine.spec -> 1.3
---

diff --git a/browser-plugin-kaffeine.spec b/browser-plugin-kaffeine.spec
index ffcf7d6..07fa58e 100644
--- a/browser-plugin-kaffeine.spec
+++ b/browser-plugin-kaffeine.spec
@@ -17,7 +17,6 @@ BuildRequires:	xorg-lib-libSM-devel
 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
@@ -33,7 +32,8 @@ This package delivers a video/audio player plugin for web browsers.
 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}.