rendered paste body--- rpmbuild/SPECS/totem-xine.spec.org 2006-11-02 12:25:36.000000000 +0100
+++ rpmbuild/SPECS/totem-xine.spec 2006-11-02 12:27:44.000000000 +0100
@@ -3,8 +3,8 @@
Summary: A GTK2 front-end for xine-lib.
Name: totem-xine
-Version: 2.16.2
-Release: 1%{?dist}
+Version: 2.16.1
+Release: 4%{?dist}
License: GPL
Group: Applications/Multimedia
URL: http://www.gnome.org/projects/totem/
@@ -39,12 +39,14 @@
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-%package -n mozilla-%{name}
+%package mozplugin
Summary: The Totem Mozilla plugin
Group: Applications/Internet
Requires: %{name} = %{version}
-Obsoletes: totem-mozplugin <= %{version}-%{release}
-Provides: totem-mozplugin = %{version}-%{release}
+Conflicts: totem-gstreamer, totem
+Obsoletes: mozilla-totem-xine <= %{version}-%{release}
+Provides: mozilla-totem-xine = %{version}-%{release}
+
# --------------------------------------------------------------------
@@ -176,9 +178,11 @@
# --------------------------------------------------------------------
%changelog
-* Wed Oct 18 2006 Dams <anvil[AT]livna.org> - 2.16.2-1
-- Updated to 2.16.2
-- Obsoleting stupidly-named totem-mozplugin (#1180)
+* Thu Nov 02 2006 Thorsten Leemhuis <feodra[AT]leemhuis.info> - 2.16.1-4
+- Rename plugin package to totem-xine-mozplugin (vs. totem-xine-mozplugin#
+ from core)
+- Explcit conflict in totem-xine-mozplugin with totem-mozplugin
+- Remove Obsoletes on totem-mozplugin as it conflicts with Core (#1211)
* Thu Sep 28 2006 Dams <anvil[AT]livna.org> - 2.16.1-3
- Forgot a buildreq