[telepathy-qt4] drop -farstream-devel subpkg

[Rex Dieter]

commit e2e16c9dbdfd52fcd2fbf8dce6d7519b43223730
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 2 07:57:53 2012 -0500

    drop -farstream-devel subpkg

 telepathy-qt4.spec |   36 ++++++++++++++++--------------------
 1 files changed, 16 insertions(+), 20 deletions(-)
---
diff --git a/telepathy-qt4.spec b/telepathy-qt4.spec
index cb41865..c6d9b99 100644
--- a/telepathy-qt4.spec
+++ b/telepathy-qt4.spec
@@ -1,6 +1,6 @@
 Name:    telepathy-qt4
 Version: 0.9.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: High-level bindings for Telepathy
 
 License: LGPLv2+
@@ -38,22 +38,19 @@ Summary: Development files for %{name}
 Provides: telepathy-qt-devel = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: telepathy-filesystem
+Obsoletes: telepathy-qt4-farstream-devel < 0.9.1-2
+Provides:  telepathy-qt4-farstream-devel = %{version}-%{release} 
+Provides:  telepathy-qt-farstream-devel = %{version}-%{release}
 %description devel
 %{summary}.
 
 %package farstream
 Summary: Farstream %{name} bindings
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Provides:  telepathy-qt-farstream = %{version}-%{release}
 %description farstream 
 %{summary}.
 
-%package farstream-devel
-Summary: Developement files for %{name}-farstream 
-Provides: telepathy-qt-farstream-devel = %{version}-%{release}
-Requires: %{name}-farstream%{?_isa} = %{version}-%{release}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-%description farstream-devel
-%{summary}.
 
 
 %prep
@@ -82,30 +79,29 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %doc COPYING AUTHORS NEWS README ChangeLog
 %{_libdir}/libtelepathy-qt4.so.2*
 
+%post farstream -p /sbin/ldconfig
+%postun farstream -p /sbin/ldconfig
+
+%files farstream
+%{_libdir}/libtelepathy-qt4-farstream.so.2*
+
 %files devel
 %doc HACKING
 %dir %{_includedir}/telepathy-qt4/
 %{_includedir}/telepathy-qt4/TelepathyQt/
 %{_libdir}/libtelepathy-qt4.so
+%{_libdir}/libtelepathy-qt4-farstream.so
 %{_libdir}/pkgconfig/TelepathyQt4.pc
+%{_libdir}/pkgconfig/TelepathyQt4Farstream.pc
 %dir %{_libdir}/cmake
 %{_libdir}/cmake/TelepathyQt4/
-%exclude %{_includedir}/telepathy-qt4/TelepathyQt/Farstream/
-
-%post farstream -p /sbin/ldconfig
-%postun farstream -p /sbin/ldconfig
-
-%files farstream
-%{_libdir}/libtelepathy-qt4-farstream.so.2*
-
-%files farstream-devel
-%{_includedir}/telepathy-qt4/TelepathyQt/Farstream/
 %{_libdir}/cmake/TelepathyQt4Farstream/
-%{_libdir}/libtelepathy-qt4-farstream.so
-%{_libdir}/pkgconfig/TelepathyQt4Farstream.pc
 
 
 %changelog
+* Mon Apr 02 2012 Rex Dieter <rdieter at fedoraproject.org> 0.9.1-2
+- drop -farstream-devel subpkg
+
 * Sat Mar 24 2012 Rex Dieter <rdieter at fedoraproject.org> 0.9.1-1
 - 0.9.1
 - -farstream(-devel) subpkgs