Merge -vala subpackage into -devel

Other gnome packages ship vapi files in -devel; no point in trying to
do a different thing in grilo.

grilo.spec

@@ -39,24 +39,16 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       glib2-devel gobject-introspection-devel
 
+# Provide upgrade path for -vala subpackage that was merged into -devel during
+# the F23 cycle
+Obsoletes:      grilo-vala < 0.2.13
+
 %description devel
 Grilo is a framework that provides access to different sources of
 multimedia content, using a pluggable system.
 This package contains the core library and elements, as well as
 general and API documentation.
 
-%package vala
-Summary:        Vala language bindings for Grilo framework
-Group:          Development/Libraries
-
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       vala >= 0.7.2
-
-%description vala
-Grilo is a framework that provides access to different sources of
-multimedia content, using a pluggable system.
-This package contains the Vala language bindings.
-
 %prep
 %setup -q
 
@@ -114,14 +106,12 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/grilo-simple-playlist
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/gir-1.0/*.gir
-
-%files vala
-%doc AUTHORS COPYING NEWS README TODO
-%{_datadir}/vala/vapi/*
+%{_datadir}/vala/
 
 %changelog
 * Tue Sep 08 2015 Kalev Lember <klember@redhat.com> - 0.2.13-1
 - Update to 0.2.13
+- Merge -vala subpackage into -devel
 
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild