[libchamplain] Drop separate -vala subpackage and ship the vala files in -devel

[Kalev Lember]

commit cff4c6126d487e8d970956fb06aac029f14c2745
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Jul 2 15:40:35 2014 +0200

    Drop separate -vala subpackage and ship the vala files in -devel

 libchamplain.spec |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/libchamplain.spec b/libchamplain.spec
index e906e62..8b25eaf 100644
--- a/libchamplain.spec
+++ b/libchamplain.spec
@@ -27,6 +27,7 @@ Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	gobject-introspection-devel
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	%{name}-vala < 0.12.8-1
 
 %description devel
 This package contains development files for %{name}.
@@ -45,19 +46,11 @@ Summary:	Development files for %{name}-gtk
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-gtk = %{version}-%{release}
+Obsoletes:	%{name}-vala < 0.12.8-1
 
 %description gtk-devel
 This package contains development files for %{name}-gtk.
 
-%package vala
-Summary:	Vala bindings for %{name}
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-Requires:	vala
-
-%description vala
-This package contains vala bindings for development %{name}.
-
 %package demos
 Summary:	Demo apps for %{name}
 Group:		Development/Libraries
@@ -105,6 +98,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-gtk-*.so.*
 %files devel
 %doc %{_datadir}/gtk-doc/html/libchamplain-0.12
 %{_datadir}/gir-1.0/Champlain-0.12.gir
+%{_datadir}/vala/vapi/champlain-0.12.vapi
 %{_libdir}/%{name}-0.12.so
 %{_libdir}/pkgconfig/champlain-0.12.pc
 %{_includedir}/%{name}-0.12
@@ -116,14 +110,11 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-gtk-*.so.*
 %files gtk-devel
 %doc %{_datadir}/gtk-doc/html/libchamplain-gtk-0.12
 %{_datadir}/gir-1.0/GtkChamplain-0.12.gir
+%{_datadir}/vala/vapi/champlain-gtk-0.12.vapi
 %{_libdir}/%{name}-gtk-0.12.so
 %{_libdir}/pkgconfig/champlain-gtk-0.12.pc
 %{_includedir}/%{name}-gtk-0.12
 
-%files vala
-%{_datadir}/vala/vapi/champlain-0.12.vapi
-%{_datadir}/vala/vapi/champlain-gtk-0.12.vapi
-
 %files demos
 %doc demos/*.c
 %doc demos/*.h
@@ -138,6 +129,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-gtk-*.so.*
 - Update to 0.12.8
 - Drop upstreamed patches
 - Fix a -devel multilib conflict (#565676)
+- Drop separate -vala subpackage and ship the vala files in -devel
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild