From 8f3f5b2c6fe0c1499e257e931f5e79b6cf061ed1 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Aug 15 2010 15:03:17 +0000
Subject: Merge branch 'master' into f13


---

diff --git a/.gitignore b/.gitignore
index 5a8443f..56e021d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 vala-0.9.3.tar.bz2
+vala-0.9.4.tar.bz2
+vala-0.9.5.tar.bz2
diff --git a/sources b/sources
index 02c263f..37c4483 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2e905921d695d0bd85c5e114e2b3d84  vala-0.9.3.tar.bz2
+2c92ba5ebdc1d56299535f562991a2a8  vala-0.9.5.tar.bz2
diff --git a/vala.spec b/vala.spec
index 6aa0911..b185305 100644
--- a/vala.spec
+++ b/vala.spec
@@ -2,8 +2,10 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=609292
 #global main_ver 0.9
 
+%global api_ver 0.10
+
 Name:           vala
-Version:        0.9.3
+Version:        0.9.5
 Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
@@ -145,7 +147,7 @@ cp -p %{SOURCE3} COPYING
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libvala.la
+rm $RPM_BUILD_ROOT%{_libdir}/libvala-%{api_ver}.la
 
 # Emacs mode files
 mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
@@ -164,28 +166,39 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING INSTALL MAINTAINERS NEWS README THANKS
+# TODO to support parallel installation, the symlinks in bin/ must be
+# migrated to use the alternatives system
 %{_bindir}/vala
 %{_bindir}/valac
-%{_datadir}/vala
-%{_libdir}/libvala.so.*
+%{_bindir}/vala-%{api_ver}
+%{_bindir}/valac-%{api_ver}
+%{_datadir}/vala-%{api_ver}
+%{_libdir}/libvala-%{api_ver}.so.*
 %{_mandir}/*/valac*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/vala-1.0
-%{_libdir}/libvala.so
-%{_libdir}/pkgconfig/vala-1.0.pc
+%{_includedir}/vala-%{api_ver}
+%{_libdir}/libvala-%{api_ver}.so
+%{_libdir}/pkgconfig/vala-%{api_ver}.pc
+# directory ownership satisfied by this chain:
+# vala-devel R vala R gtk2-devel R automake
+%{_datadir}/aclocal/vala.m4
 
 %files tools
 %defattr(-,root,root,-)
-%{_bindir}/*gen*
+%{_bindir}/vala-gen-introspect
 %{_bindir}/vapicheck
-%{_libdir}/vala
+%{_bindir}/vapigen
+%{_bindir}/vala-gen-introspect-%{api_ver}
+%{_bindir}/vapicheck-%{api_ver}
+%{_bindir}/vapigen-%{api_ver}
+%{_libdir}/vala-%{api_ver}
 %{_mandir}/*/*gen*
 
 %files doc
 %defattr(-,root,root,-)
-%{_datadir}/devhelp/books/vala
+%{_datadir}/devhelp/books/vala-%{api_ver}
 
 %files -n emacs-%{name}
 %defattr(-,root,root,-)
@@ -201,6 +214,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug  9 2010 Michel Salim <salimma@fedoraproject.org> - 0.9.5-1
+- Update to 0.9.5
+
+* Mon Aug  2 2010 Peter Robinson <pbrobinson@gmail.com> - 0.9.4-1
+- Update to 0.9.4
+
 * Thu Jul 15 2010 Michel Salim <salimma@fedoraproject.org> - 0.9.3-1
 - Update to 0.9.3