[compat-telepathy-farstream] drop Conflicts: tag for real

[Rex Dieter]

commit 37e5b9332dcb7ea4bf61fc5b81f15e398beb9480
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Dec 18 06:15:50 2012 -0600

    drop Conflicts: tag for real

 compat-telepathy-farstream.spec |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/compat-telepathy-farstream.spec b/compat-telepathy-farstream.spec
index 66fbdac..2edb209 100644
--- a/compat-telepathy-farstream.spec
+++ b/compat-telepathy-farstream.spec
@@ -1,7 +1,7 @@
 
 Name:    compat-telepathy-farstream
 Version: 0.4.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Telepathy client library to handle Call channels
 
 License: LGPLv2+
@@ -20,10 +20,6 @@ Call channels.
 %package devel
 Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
-## upstream never intended this to be parallel-installable, since this
-## is -devel and not runtime, conflicting could be better than introducing
-## a multitude of hacks (changing include dir(s), lib*.so symlink, and .pc references) 
-Conflicts: telepathy-farstream-devel >= 0.6
 %description devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -76,6 +72,9 @@ rm -rfv %{buildroot}%{_datadir}/gtk-doc/
 
 
 %changelog
+* Tue Dec 18 2012 Rex Dieter <rdieter at fedoraproject.org> 0.4.0-5
+- drop Conflicts: tag for real
+
 * Wed Oct 31 2012 Rex Dieter <rdieter at fedoraproject.org> 0.4.0-4
 - drop Conflicts, make truly parallel-installable