From d6c29b77b95936aaa61250c45bddcb941a572135d4a333f9b74c61cab5776b9b Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Mon, 26 Mar 2012 08:01:30 +0000
Subject: [PATCH] Accepting request 110799 from
 home:vuntz:branches:GNOME:Factory

Change Conflicts to Obsoletes

OBS-URL: https://build.opensuse.org/request/show/110799
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/farstream?expand=0&rev=5
---
 farstream.changes |  8 ++++++++
 farstream.spec    | 25 +++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/farstream.changes b/farstream.changes
index b7c6f6f..a7b08f4 100644
--- a/farstream.changes
+++ b/farstream.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Mar 23 11:34:25 UTC 2012 - vuntz@opensuse.org
+
+- Change libgstfarsight-0_10-0 Conflicts to Obsoletes in
+  gstreamer-0_10-plugins-farstream: now that all the farstream
+  stack has entered Factory, we can drop the farsight one. The
+  Obsoletes will help with a smooth transition.
+
 -------------------------------------------------------------------
 Wed Mar 14 08:28:00 UTC 2012 - vuntz@opensuse.org
 
diff --git a/farstream.spec b/farstream.spec
index 288a448..685de7a 100644
--- a/farstream.spec
+++ b/farstream.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package farstream
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,14 @@
 
 Name:           farstream
 Version:        0.1.1
-Release:        1
+Release:        0
 # License note: the only GPL-2.0+ files are farstream-0.1.1/common/coverage/*
 # and common/gstdoc-scangobj; those are just used during the build and do not
 # affect the license of the binary packages
-License:        GPL-2.0+ and LGPL-2.1+
 Summary:        GStreamer modules and libraries for videoconferencing
-Url:            http://farsight.freedesktop.org/
+License:        GPL-2.0+ and LGPL-2.1+
 Group:          Productivity/Multimedia/Other
+Url:            http://farsight.freedesktop.org/
 Source:         http://freedesktop.org/software/farstream/releases/farstream/%{name}-%{version}.tar.gz
 BuildRequires:  fdupes
 BuildRequires:  glib2-devel >= 2.26
@@ -44,8 +44,8 @@ Farstream is a collection of GStreamer modules and libraries for
 videoconferencing.
 
 %package -n libfarstream-0_1-0
-License:        LGPL-2.1+
 Summary:        GStreamer modules and libraries for videoconferencing
+License:        LGPL-2.1+
 Group:          System/Libraries
 Requires:       %{name}-data
 # While not strictly needed, apps using farstream will need the gstreamer
@@ -57,8 +57,8 @@ Farstream is a collection of GStreamer modules and libraries for
 videoconferencing.
 
 %package -n typelib-1_0-Farstream-0_1
-License:        LGPL-2.1+
 Summary:        GStreamer modules and libraries for videoconferencing -- Introspection bindings
+License:        LGPL-2.1+
 Group:          System/Libraries
 
 %description -n typelib-1_0-Farstream-0_1
@@ -68,21 +68,22 @@ videoconferencing.
 This package provides the GObject Introspection bindings for Farstream.
 
 %package -n gstreamer-0_10-plugins-farstream
-License:        LGPL-2.1+
 Summary:        GStreamer Plug-Ins for videoconferencing
+License:        LGPL-2.1+
 Group:          Productivity/Multimedia/Other
 Requires:       gstreamer-0_10-plugins-bad >= 0.10.23
 Requires:       gstreamer-0_10-plugins-good >= 0.10.29
-# Unfortunately, the gstreamer elements have the same name
-Conflicts:      libgstfarsight-0_10-0
+# Unfortunately, the gstreamer elements have the same name; since we're
+# dropping farsight, let's Obsolete the old package for a smooth transition
+Obsoletes:      libgstfarsight-0_10-0
 
 %description -n gstreamer-0_10-plugins-farstream
 Farstream is a collection of GStreamer modules and libraries for
 videoconferencing.
 
 %package data
-License:        LGPL-2.1+
 Summary:        GStreamer modules and libraries for videoconferencing -- Codec preferences
+License:        LGPL-2.1+
 Group:          System/Libraries
 BuildArch:      noarch
 
@@ -94,8 +95,8 @@ This package contains data (codec preferences, element properties)
 used by the library.
 
 %package devel
-License:        LGPL-2.1+
 Summary:        GStreamer modules and libraries for videoconferencing -- Development files
+License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
 Requires:       libfarstream-0_1-0 = %{version}
 Requires:       typelib-1_0-Farstream-0_1 = %{version}
@@ -105,8 +106,8 @@ Farstream is a collection of GStreamer modules and libraries for
 videoconferencing.
 
 %package -n python-farstream
-License:        LGPL-2.1+
 Summary:        GStreamer modules and libraries for videoconferencing -- Python bindings
+License:        LGPL-2.1+
 Group:          Development/Libraries/Python
 Requires:       libfarstream-0_1-0 = %{version}
 %py_requires